From 6ad527893dc5dcd05cfcd45c6340905f0f89659a Mon Sep 17 00:00:00 2001
From: preyearegmi <preyearegmi@outlook.com>
Date: Sun, 26 Aug 2018 14:46:08 +0900
Subject: [PATCH] Recipient V2 Form added

---
 .idea/caches/build_file_checksums.ser         | Bin 535 -> 535 bytes
 app/src/main/AndroidManifest.xml              |  10 +-
 .../recipient/model/RecipientModel.java       |  18 +-
 .../gateway/RecipientV2Gateway.java           |  21 ++
 .../RecipientV2InteractorInterface.java       |  16 +
 .../presenter/RecipientV2Presenter.java       |  41 +++
 .../RecipientV2PresenterInterface.java        |  16 +
 .../recipientV2/view/RecipientV2Activity.java |  15 +
 .../utils/https/APIRequestErrorReturn.java    |   9 +
 .../main/res/layout/activity_recipient_v2.xml | 287 ++++++++++++++++++
 10 files changed, 422 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/gateway/RecipientV2Gateway.java
 create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2InteractorInterface.java
 create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2Presenter.java
 create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2PresenterInterface.java
 create mode 100644 app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientV2Activity.java
 create mode 100644 app/src/main/res/layout/activity_recipient_v2.xml

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 96917ecaf760435015e34865eade10a0ddd4ec52..d7b68451a823d704f32404a348089cc68dafd43a 100644
GIT binary patch
delta 15
XcmbQvGM#0@43?7RlRs^oQ_TnfGb;wn

delta 15
WcmbQvGM#0@43_-5F1?L&su=+-+6B=7

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0777c476..943248d9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -108,7 +108,7 @@
         <activity
             android:name=".kycform.view.KycFormActivity"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden"></activity>
+            android:windowSoftInputMode="stateAlwaysHidden" />
         <activity android:name=".socials.view.SocialActivity" />
         <activity
             android:name=".socials.view.CommentsActivity"
@@ -466,10 +466,12 @@
             android:name="io.fabric.ApiKey"
             android:value="7eb95a28f547df8a78962debbacd94ceeaa826dd" />
 
-        <activity android:name=".agentsV2.view.AgentListV2Activity"
+        <activity
+            android:name=".agentsV2.view.AgentListV2Activity"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden"
-            android:screenOrientation="portrait"/>
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity android:name=".recipientV2.view.RecipientV2Activity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipient/model/RecipientModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipient/model/RecipientModel.java
index 7524105a..f4d485a4 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipient/model/RecipientModel.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipient/model/RecipientModel.java
@@ -281,6 +281,7 @@ public class RecipientModel implements RecipientContract.SendMoneyModel {
 
     @Override
     public void getAllSourceOfReasons(final RecipientContract.ModelListener listener, final String type) {
+
         if (!Utils.isNetworkConnected(context)) {
             listener.onNoInternetConnection(ALL_SOURCE_OF_REASONS);
         } else {
@@ -315,13 +316,16 @@ public class RecipientModel implements RecipientContract.SendMoneyModel {
                         modal.performLogout();
                     } else {
                         {
-                            Gson gson = new GsonBuilder().create();
-                            APIRequestErrorReturn statusErrorReturn = new APIRequestErrorReturn();
-                            try {
-                                statusErrorReturn = gson.fromJson(response.errorBody().string(), APIRequestErrorReturn.class);
-                                listener.onFailureSourceOfReason(statusErrorReturn, type);
-                            } catch (IOException e) {
-                            }
+//                            TODO commented to avoid crash
+//                            Gson gson = new GsonBuilder().create();
+//                            APIRequestErrorReturn statusErrorReturn = new APIRequestErrorReturn();
+//                            try {
+//                                statusErrorReturn = gson.fromJson(response.errorBody().string(), APIRequestErrorReturn.class);
+//                                listener.onFailureSourceOfReason(statusErrorReturn, type);
+//                            } catch (IOException e) {
+//                            }
+                            //TODO to handle crash
+                                listener.onFailureSourceOfReason(new APIRequestErrorReturn("Failed","Api crash","Unable to handle error"), type);
                         }
                     }
                 }
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/gateway/RecipientV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/gateway/RecipientV2Gateway.java
new file mode 100644
index 00000000..70b7e0db
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/gateway/RecipientV2Gateway.java
@@ -0,0 +1,21 @@
+package com.gmeremit.online.gmeremittance_native.recipientV2.gateway;
+
+import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway;
+import com.gmeremit.online.gmeremittance_native.recipientV2.presenter.RecipientV2InteractorInterface;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import io.reactivex.Observable;
+
+public class RecipientV2Gateway extends PrivilegedGateway implements RecipientV2InteractorInterface.RecipientV2GatewayInterface {
+
+    private final RecipientV2InteractorInterface interactor;
+
+
+    public RecipientV2Gateway(RecipientV2InteractorInterface agentListV2InteractorInterface) {
+        this.interactor=agentListV2InteractorInterface;
+    }
+
+
+
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2InteractorInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2InteractorInterface.java
new file mode 100644
index 00000000..4524007a
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2InteractorInterface.java
@@ -0,0 +1,16 @@
+package com.gmeremit.online.gmeremittance_native.recipientV2.presenter;
+
+import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface;
+import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface;
+
+import io.reactivex.Observable;
+
+public interface RecipientV2InteractorInterface extends BaseInteractorInterface {
+
+
+     interface RecipientV2GatewayInterface extends PrivilegedGatewayInterface
+    {
+
+
+    }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2Presenter.java
new file mode 100644
index 00000000..3726058a
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2Presenter.java
@@ -0,0 +1,41 @@
+package com.gmeremit.online.gmeremittance_native.recipientV2.presenter;
+
+import com.gmeremit.online.gmeremittance_native.agentsV2.gateway.AgentListV2Gateway;
+import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
+import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
+import com.gmeremit.online.gmeremittance_native.recipientV2.presenter.RecipientV2InteractorInterface;
+import com.gmeremit.online.gmeremittance_native.recipientV2.presenter.RecipientV2PresenterInterface;
+import com.gmeremit.online.gmeremittance_native.utils.Constants;
+import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse;
+
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
+
+public class RecipientV2Presenter extends BasePresenter implements RecipientV2PresenterInterface, RecipientV2InteractorInterface {
+
+
+    private final RecipientV2ContractInterface view;
+    CompositeDisposable compositeDisposable;
+
+    public RecipientV2Presenter(RecipientV2ContractInterface view) {
+        this.view = view;
+
+        this.compositeDisposable = new CompositeDisposable();
+    }
+
+    @Override
+    public void getAllData() {
+
+    }
+
+    @Override
+    public void onViewDestroyed() {
+        super.onViewDestroyed();
+        if (compositeDisposable != null && !compositeDisposable.isDisposed())
+            compositeDisposable.dispose();
+    }
+
+
+
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2PresenterInterface.java
new file mode 100644
index 00000000..cd14ccc6
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2PresenterInterface.java
@@ -0,0 +1,16 @@
+package com.gmeremit.online.gmeremittance_native.recipientV2.presenter;
+
+import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
+import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface;
+
+import java.util.List;
+
+public interface RecipientV2PresenterInterface extends BasePresenterInterface {
+
+    void getAllData();
+
+    interface RecipientV2ContractInterface extends BaseContractInterface
+    {
+
+    }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientV2Activity.java
new file mode 100644
index 00000000..a0e7a208
--- /dev/null
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientV2Activity.java
@@ -0,0 +1,15 @@
+package com.gmeremit.online.gmeremittance_native.recipientV2.view;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.gmeremit.online.gmeremittance_native.R;
+
+public class RecipientV2Activity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_recipient_v2);
+    }
+}
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/APIRequestErrorReturn.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/APIRequestErrorReturn.java
index 35e1387f..611369eb 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/APIRequestErrorReturn.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/APIRequestErrorReturn.java
@@ -17,4 +17,13 @@ public class APIRequestErrorReturn {
     @SerializedName("details")
     @Expose
     public String details;
+
+    public APIRequestErrorReturn(String error, String message, String details) {
+        this.error = error;
+        this.message = message;
+        this.details = details;
+    }
+
+    public APIRequestErrorReturn() {
+    }
 }
diff --git a/app/src/main/res/layout/activity_recipient_v2.xml b/app/src/main/res/layout/activity_recipient_v2.xml
new file mode 100644
index 00000000..b05691b5
--- /dev/null
+++ b/app/src/main/res/layout/activity_recipient_v2.xml
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.gmeremit.online.gmeremittance_native.recipient.view.NewRecipientActivity">
+
+    <include layout="@layout/layout_sendmoney_toolbar" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/background_gray"
+            android:orientation="vertical">
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:background="#e7edf2"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="Who are you sending money to?"
+                android:textColor="@color/darkgray"
+                android:textSize="18sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:padding="10dp">
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/firstnameWrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="First Name"
+                    android:textColorHint="@color/darkgray">
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                        android:id="@+id/ed_firstname"
+                        style="@style/editetxtsingleline"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/middlenameWrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Middle Name (Optional)"
+                    android:textColorHint="@color/darkgray">
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                        android:id="@+id/ed_middlename"
+                        style="@style/editetxtsingleline"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/lastnameWrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Last Name"
+                    android:textColorHint="@color/darkgray">
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                        android:id="@+id/ed_lastname"
+                        style="@style/editetxtsingleline"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </android.support.design.widget.TextInputLayout>
+
+              <FrameLayout
+                  android:id="@+id/countryViewContainer"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  >
+                  <android.support.design.widget.TextInputLayout
+                      android:id="@+id/countryWrapper"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:hint="Select Country"
+                      android:textColorHint="@color/darkgray">
+
+                      <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                          android:id="@+id/ed_country"
+                          style="@style/editetxtsingleline"
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                           />
+                  </android.support.design.widget.TextInputLayout>
+                  <ImageView
+                      android:layout_marginRight="12dp"
+                      android:layout_gravity="center_vertical|end"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:background="@drawable/ic_arrow_down"/>
+              </FrameLayout>
+
+              <FrameLayout
+                  android:id="@+id/provinceViewContainer"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  >
+                  <android.support.design.widget.TextInputLayout
+                      android:id="@+id/provinceWrapper"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:hint="State/Province"
+                      android:textColorHint="@color/darkgray">
+
+                      <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                          android:id="@+id/ed_province"
+                          style="@style/editetxtsingleline"
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                           />
+                  </android.support.design.widget.TextInputLayout>
+                  <ImageView
+                      android:layout_marginRight="12dp"
+                      android:layout_gravity="center_vertical|end"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:background="@drawable/ic_arrow_down"/>
+              </FrameLayout>
+
+              <FrameLayout
+                  android:id="@+id/districtViewContainer"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  >
+                  <android.support.design.widget.TextInputLayout
+                      android:id="@+id/districtWrapper"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:hint="District"
+                      android:textColorHint="@color/darkgray">
+
+                      <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                          android:id="@+id/ed_district"
+                          style="@style/editetxtsingleline"
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                           />
+                  </android.support.design.widget.TextInputLayout>
+                  <ImageView
+                      android:layout_marginRight="12dp"
+                      android:layout_gravity="center_vertical|end"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:background="@drawable/ic_arrow_down"/>
+              </FrameLayout>
+
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/addressWrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Address"
+                    android:textColorHint="@color/darkgray">
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                        android:id="@+id/ed_address"
+                        style="@style/editetxtsingleline"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </android.support.design.widget.TextInputLayout>
+
+                <FrameLayout
+                    android:id="@+id/distViewContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    >
+                    <android.support.design.widget.TextInputLayout
+                        android:id="@+id/relationWrapper"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="Relation"
+                        android:textColorHint="@color/darkgray">
+
+                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                            android:id="@+id/ed_relation"
+                            style="@style/editetxtsingleline"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            />
+                    </android.support.design.widget.TextInputLayout>
+                    <ImageView
+                        android:layout_marginRight="12dp"
+                        android:layout_gravity="center_vertical|end"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/ic_arrow_down"/>
+                </FrameLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/mobileWrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Mobile No."
+                    android:textColorHint="@color/darkgray">
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                        android:id="@+id/ed_mobile_no"
+                        style="@style/editetxtsingleline"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="phone" />
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/emailWrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Email (Optional)"
+                    android:textColorHint="@color/darkgray">
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                        android:id="@+id/ed_email"
+                        style="@style/editetxtsinglelineDone"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textEmailAddress" />
+                </android.support.design.widget.TextInputLayout>
+
+                <FrameLayout
+                    android:id="@+id/transferViewContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    >
+                    <android.support.design.widget.TextInputLayout
+                        android:id="@+id/transferWrapper"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="Transfer Reason"
+                        android:textColorHint="@color/darkgray">
+
+                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                            android:id="@+id/ed_transfer"
+                            style="@style/editetxtsingleline"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            />
+                    </android.support.design.widget.TextInputLayout>
+                    <ImageView
+                        android:layout_marginRight="12dp"
+                        android:layout_gravity="center_vertical|end"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/ic_arrow_down"/>
+                </FrameLayout>
+
+
+            </LinearLayout>
+
+            <Button
+                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:onClick="onClickSubmit"
+                android:text="Save and Continue"
+                android:textAllCaps="false"
+                android:textColor="@color/white"
+                android:textSize="16sp" />
+
+
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>