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

Recipient V2 Form added

master
preyearegmi 6 years ago
parent
541ef69523
commit
6ad527893d
10 changed files with 422 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 10
      app/src/main/AndroidManifest.xml
  3. 18
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipient/model/RecipientModel.java
  4. 21
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/gateway/RecipientV2Gateway.java
  5. 16
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2InteractorInterface.java
  6. 41
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2Presenter.java
  7. 16
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2PresenterInterface.java
  8. 15
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientV2Activity.java
  9. 9
      app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/APIRequestErrorReturn.java
  10. 287
      app/src/main/res/layout/activity_recipient_v2.xml

BIN
.idea/caches/build_file_checksums.ser
View File

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

@ -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>

18
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipient/model/RecipientModel.java
View File

@ -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);
}
}
}

21
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/gateway/RecipientV2Gateway.java
View File

@ -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;
}
}

16
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2InteractorInterface.java
View File

@ -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
{
}
}

41
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2Presenter.java
View File

@ -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();
}
}

16
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/RecipientV2PresenterInterface.java
View File

@ -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
{
}
}

15
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/RecipientV2Activity.java
View File

@ -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);
}
}

9
app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/APIRequestErrorReturn.java
View File

@ -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() {
}
}

287
app/src/main/res/layout/activity_recipient_v2.xml
View File

@ -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>
Write Preview
Loading…
Cancel
Save