Added city field in receiver profile

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/gateway/RecipientAddV2Gateway.java

@@ -25,7 +25,8 @@ public class RecipientAddV2Gateway extends PrivilegedGateway implements Recipien
     }
 
     @Override
-    public Observable<AddRecipientApiResponse> addRecipientAndSendToServer(String auth, String userId, String firstname, String middleName, String lastName, String country, String state, String district, String address, String relation, String mobileNo, String email, String transferReason, String selectedRecipientId) {
+    public Observable<AddRecipientApiResponse> addRecipientAndSendToServer(String auth, String userId, String firstname, String middleName, String lastName, String country, String state, String district, String address, String relation, String mobileNo, String email, String transferReason, String selectedRecipientId,String city) {
+
         JsonObject jsonObject=new JsonObject();
         jsonObject.addProperty("FirstName",firstname);
         jsonObject.addProperty("MiddleName",middleName);
@@ -39,6 +40,7 @@ public class RecipientAddV2Gateway extends PrivilegedGateway implements Recipien
         jsonObject.addProperty("Email",email);
         jsonObject.addProperty("TransferReason",transferReason);
         jsonObject.addProperty("Id",selectedRecipientId);
+        jsonObject.addProperty("City",city);
 
         return HttpClientV2.getInstance().addRecipientV2(auth,userId,jsonObject);
     }

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/model/recipientlisting/RecipientInfoModel.java

@@ -309,4 +309,31 @@ public class RecipientInfoModel implements Parcelable {
             return new RecipientInfoModel[size];
         }
     };
+
+    @Override
+    public String toString() {
+        return "RecipientInfoModel{" +
+                "mobileNumber='" + mobileNumber + '\'' +
+                ", district='" + district + '\'' +
+                ", reasonId='" + reasonId + '\'' +
+                ", relation='" + relation + '\'' +
+                ", country='" + country + '\'' +
+                ", dpUrl='" + dpUrl + '\'' +
+                ", city='" + city + '\'' +
+                ", relationId='" + relationId + '\'' +
+                ", countryId='" + countryId + '\'' +
+                ", countryCode='" + countryCode + '\'' +
+                ", state='" + state + '\'' +
+                ", email='" + email + '\'' +
+                ", middleName='" + middleName + '\'' +
+                ", firstName='" + firstName + '\'' +
+                ", recipientId='" + recipientId + '\'' +
+                ", reason='" + reason + '\'' +
+                ", districtId='" + districtId + '\'' +
+                ", stateId='" + stateId + '\'' +
+                ", lastName='" + lastName + '\'' +
+                ", address='" + address + '\'' +
+                ", userId='" + userId + '\'' +
+                '}';
+    }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2InteractorInterface.java

@@ -27,6 +27,7 @@ public interface RecipientAddV2InteractorInterface extends BaseInteractorInterfa
                                                                         String mobileNo,
                                                                         String email,
                                                                         String transferReason,
-                                                                        String selectedRecipientId);
+                                                                        String selectedRecipientId,
+                                                                        String city);
     }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java

@@ -1,5 +1,7 @@
 package com.gmeremit.online.gmeremittance_native.recipientV2.presenter.recipientadd;
 
+import android.util.Log;
+
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
@@ -50,10 +52,10 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
     @Override
     public void addRecipient(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry,
                              ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict,
-                             String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer, String selectedRecipientId) {
+                             String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer, String selectedRecipientId,String city) {
 
 
-        if(validateData(firstName,middleName,lastName,selectedCountry,selectedProvince,selectedDistrict,address,selectedRelation,mobileNo,email,selectedTransfer))
+        if(validateData(firstName,middleName,lastName,selectedCountry,selectedProvince,selectedDistrict,address,selectedRelation,mobileNo,email,selectedTransfer,city))
         {
             this.compositeDisposable.add(this.gateway.addRecipientAndSendToServer(gateway.getAuth(),
                     gateway.getUserID(),
@@ -65,7 +67,8 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
                     mobileNo,
                     email,
                     selectedTransfer.getId(),
-                    selectedRecipientId
+                    selectedRecipientId,
+                    city
                     )
                             .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                             .doFinally(() -> view.showProgressBar(false, ""))
@@ -79,9 +82,10 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
 
     private boolean validateData(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry,
                                  ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict,
-                                 String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer)
+                                 String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer,String city)
     {
         boolean isValid= true;
+
         if(!validateFirstName(firstName))
             isValid=false;
         if(!validateLastName(lastName))
@@ -96,11 +100,24 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
             isValid=false;
        if(!validatTransfer(selectedTransfer))
            isValid=false;
+       if(!validateCity(city))
+           isValid=false;
 
 
         return isValid;
     }
 
+    private boolean validateCity(String city) {
+        if(!checkStringNotEmpty(city))
+        {
+            view.setErrorOnCity(getStringfromStringId(R.string.city_error));
+            return false;
+        }
+        view.setErrorOnCity(null);
+
+        return true;
+    }
+
 
     private boolean validateFirstName(String firstName)
     {
@@ -344,7 +361,8 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
                         selectedRelationDetailModel,
                         editableData.getMobileNumber(),
                         editableData.getEmail(),
-                        selectedTransferDetailModel);
+                        selectedTransferDetailModel,
+                        editableData.getCity());
 
                 view.showRelatedData(metaData);
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2PresenterInterface.java

@@ -14,7 +14,7 @@ public interface RecipientAddV2PresenterInterface extends BasePresenterInterface
 
     void getAllData();
 
-    void addRecipient(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry, ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict, String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer, String selectedRecipientId);
+    void addRecipient(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry, ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict, String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer, String selectedRecipientId,String city);
 
     void prepareRecipientForEdit(RecipientInfoModel recipientToBeEdited);
 
@@ -31,12 +31,15 @@ public interface RecipientAddV2PresenterInterface extends BasePresenterInterface
                                 RelationDetailModel selectedRelation,
                                 String mobileNo,
                                 String email,
-                                TransferDetailModel selectedTransfer);
+                                TransferDetailModel selectedTransfer,
+                                String city);
 
         void returnToCallingActivityForSucess();
 
         void setErrorOnFirstName(String message);
 
+        void setErrorOnCity(String message);
+
         void setErrorOnCountry(String message);
 
         void setErrorOnProvince(String message);

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/view/recipientadd/RecipientAddV2Activity.java

@@ -63,6 +63,8 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
     EditText ed_email;
     @BindView(R.id.ed_transfer)
     EditText ed_transfer;
+    @BindView(R.id.ed_city)
+    EditText ed_city;
 
     @BindView(R.id.firstnameWrapper)
     TextInputLayout firstnameWrapper;
@@ -86,6 +88,8 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
     TextInputLayout emailWrapper;
     @BindView(R.id.transferWrapper)
     TextInputLayout transferWrapper;
+    @BindView(R.id.cityWrapper)
+    TextInputLayout cityWrapper;
 
     @BindView(R.id.countryViewContainer)
     ViewGroup countryViewContainer;
@@ -257,7 +261,8 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
                         ed_mobile_no.getText().toString(),
                         ed_email.getText().toString(),
                         selectedTransferReason,
-                        selectedRecipientId
+                        selectedRecipientId,
+                        ed_city.getText().toString()
                 );
                 break;
         }
@@ -386,7 +391,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
     }
 
     @Override
-    public void showDataForEditing(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry, ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict, String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer) {
+    public void showDataForEditing(String firstName, String middleName, String lastName, CountryDetailModel selectedCountry, ProvinceDetailModel selectedProvince, DistrictDetailModel selectedDistrict, String address, RelationDetailModel selectedRelation, String mobileNo, String email, TransferDetailModel selectedTransfer,String city) {
         ed_firstname.setText(firstName);
         ed_middlename.setText(middleName);
         ed_lastname.setText(lastName);
@@ -397,6 +402,7 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
         this.selectedRelation = selectedRelation;
         ed_mobile_no.setText(mobileNo);
         ed_email.setText(email);
+        ed_city.setText(city);
         this.selectedTransferReason = selectedTransfer;
 
         if (this.selectedCountry != null)
@@ -431,6 +437,11 @@ public class RecipientAddV2Activity extends BaseActivity implements View.OnClick
         firstnameWrapper.setError(message);
     }
 
+    @Override
+    public void setErrorOnCity(String message) {
+        cityWrapper.setError(message);
+    }
+
     @Override
     public void setErrorOnCountry(String message) {
         countryWrapper.setError(message);

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

@@ -219,6 +219,22 @@
                       android:layout_marginEnd="5dp" />
               </FrameLayout>
 
+                <android.support.design.widget.TextInputLayout
+                    app:errorEnabled="true"
+                    android:layout_marginTop="@dimen/kycTextUpperMargin"
+                    android:id="@+id/cityWrapper"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/city_text"
+                    android:textColorHint="@color/darkgray">
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                        android:id="@+id/ed_city"
+                        android:imeOptions="flagForceAscii|actionDone"
+                        style="@style/editetxtsingleline"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </android.support.design.widget.TextInputLayout>
 
                 <android.support.design.widget.TextInputLayout
                     app:errorEnabled="true"

app/src/main/res/values/strings.xml

@@ -525,6 +525,8 @@
     <string name="bio_message_title_text">Confirm your FaceID or TouchID to authenticate.</string>
     <string name="bio_press_button_title_text">>> Press to authenticate</string>
     <string name="coupon_text">Coupon</string>
+    <string name="city_text">City</string>
+    <string name="city_error">City cannot be empty</string>
 
 
 </resources>