diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 96917eca..d7b68451 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
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 @@
+ android:windowSoftInputMode="stateAlwaysHidden" />
-
+ android:windowSoftInputMode="stateAlwaysHidden" />
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+