Validation added to reset

app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/presenter/RegisterV2Presenter.java

@@ -91,7 +91,7 @@ public class RegisterV2Presenter extends BasePresenter implements RegisterV2Pres
 
     @Override
     public boolean validateDob(String dobString) {
-        if(dobString==null||dobString.length()<1)
+        if(dobString==null||dobString.trim().length()<1)
         {
             view.setDobError("Please enter a valid dob");
             return false;

app/src/main/java/com/gmeremit/online/gmeremittance_native/registerV2/view/RegisterV2Activity.java

@@ -111,9 +111,11 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen
                 break;
 
             case R.id.btn_submit:
-                if(presenter.validateEmail(emailMobileTextView.getText().toString())&&presenter.validateDob(ed_dob.getText().toString())&&presenter.validatePasswords(passwordTextView.getText().toString(),confirmPasswordTextView.getText().toString()))
-                    presenter.registerUser(emailMobileTextView.getText().toString(),passwordTextView.getText().toString(),ed_dob.getText().toString());
-                break;
+                if(presenter.validateEmail(emailMobileTextView.getText().toString())&&presenter.validateDob(ed_dob.getText().toString())&&presenter.validatePasswords(passwordTextView.getText().toString(),confirmPasswordTextView.getText().toString())) {
+                    hideKeyBoard();
+                    presenter.registerUser(emailMobileTextView.getText().toString(), passwordTextView.getText().toString(), ed_dob.getText().toString());
+                }
+                    break;
         }
     }
     public void promptDatePicker() {
@@ -121,7 +123,7 @@ public class RegisterV2Activity extends BaseActivity implements RegisterV2Presen
             Calendar newDate = Calendar.getInstance();
             newDate.set(year, monthOfYear, dayOfMonth);
             Log.d("year", year + monthOfYear + dayOfMonth + " ---");
-            ed_dob.setText(new SimpleDateFormat("yyyy/dd/MM", Locale.US).format(newDate.getTime()));
+            ed_dob.setText(new SimpleDateFormat("yyyy/MM/dd", Locale.US).format(newDate.getTime()));
             presenter.validateDob(ed_dob.getText().toString());
 
         }, newCalendar.get(Calendar.YEAR), newCalendar.get(Calendar.MONTH), newCalendar.get(Calendar.DAY_OF_MONTH));

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

@@ -24,7 +24,7 @@ public class ResetPassV2Gateway extends PrivilegedGateway implements ResetPassV2
     @Override
     public Observable<ResetApiResponse> resetPassV2(String auth, String userId, String dob) {
         JsonObject jsonObject=new JsonObject();
-        jsonObject.addProperty("userId",userId);
+        jsonObject.addProperty("username",userId);
         jsonObject.addProperty("dob",dob);
 
         return HttpClientV2.getInstance().resetPassV2(auth,jsonObject);

app/src/main/java/com/gmeremit/online/gmeremittance_native/resetpassV2/presenter/ResetPassV2Presenter.java

@@ -28,11 +28,6 @@ public class ResetPassV2Presenter extends BasePresenter implements ResetPassV2Pr
     }
 
 
-    @Override
-    public boolean validate(String emailId, String dob) {
-        return true;
-    }
-
     @Override
     public void resetPassword(String emailId, String dob) {
         String auth = "Basic " + Utils.toBase64("172017F9EC11222E8107142733:QRK2UM0Q:" + GmeApplication.getAppRelatedMetaData().getDeviceId());
@@ -48,6 +43,28 @@ public class ResetPassV2Presenter extends BasePresenter implements ResetPassV2Pr
 
     }
 
+    @Override
+    public boolean validateEmail(String emailId) {
+        if(!Utils.isValidEmail(emailId))
+        {
+            this.view.showIncorrectEmail("Please enter a valid email id");
+            return false;
+        }
+        this.view.showIncorrectEmail(null);
+        return true;
+    }
+
+    @Override
+    public boolean validateDob(String dobString) {
+        if(dobString==null||dobString.trim().length()<1)
+        {
+            view.showIncorrectDob("Please enter a valid dob");
+            return false;
+        }
+        view.showIncorrectDob(null);
+        return true;
+    }
+
     @Override
     public void onViewDestroyed() {
         super.onViewDestroyed();

app/src/main/java/com/gmeremit/online/gmeremittance_native/resetpassV2/presenter/ResetPassV2PresenterInterface.java

@@ -6,10 +6,13 @@ import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface;
 public interface ResetPassV2PresenterInterface extends BasePresenterInterface {
 
 
-    boolean validate(String emailId, String dob);
 
     void resetPassword(String emailId, String dob);
 
+    boolean validateEmail(String email);
+
+    boolean validateDob( String dob);
+
 
     interface ResetPassV2ContractInterface extends BaseContractInterface
     {

app/src/main/java/com/gmeremit/online/gmeremittance_native/resetpassV2/view/ResetPassV2Activity.java

@@ -79,7 +79,8 @@ public class ResetPassV2Activity extends BaseActivity implements View.OnClickLis
                 break;
 
             case R.id.btn_submit:
-                if (presenterInterface.validate(emailId.getText().toString(), ed_dob.getText().toString())) {
+                if (presenterInterface.validateEmail(emailId.getText().toString())&&presenterInterface.validateDob(ed_dob.getText().toString())) {
+                    hideKeyBoard();
                     presenterInterface.resetPassword(emailId.getText().toString(), ed_dob.getText().toString());
                 }
                 break;
@@ -92,7 +93,7 @@ public class ResetPassV2Activity extends BaseActivity implements View.OnClickLis
             newDate.set(year, monthOfYear, dayOfMonth);
             Log.d("year", year + monthOfYear + dayOfMonth + " ---");
 
-            ed_dob.setText(new SimpleDateFormat("yyyy/dd/MM", Locale.US).format(newDate.getTime()));
+            ed_dob.setText(new SimpleDateFormat("yyyy/MM/dd", Locale.US).format(newDate.getTime()));
         }, newCalendar.get(Calendar.YEAR), newCalendar.get(Calendar.MONTH), newCalendar.get(Calendar.DAY_OF_MONTH));
 
         datePickerDialog.getDatePicker().setMaxDate(System.currentTimeMillis());
@@ -103,12 +104,19 @@ public class ResetPassV2Activity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void showIncorrectEmail(String message) {
-            useridWrapper.setError(message);
+        if(message==null)
+            useridWrapper.setErrorEnabled(false);
+        else
+            useridWrapper.setErrorEnabled(true);
+        useridWrapper.setError(message);
     }
 
     @Override
     public void showIncorrectDob(String message) {
+        if(message==null)
+            dobWrapper.setErrorEnabled(false);
+        else
+            dobWrapper.setErrorEnabled(true);
         dobWrapper.setError(message);
-
     }
 }

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

@@ -65,6 +65,7 @@
                         android:layout_height="wrap_content"
                         style="@style/editetxtsingleline"
                         android:inputType="textEmailAddress"
+                        android:imeOptions="actionDone"
                         />
 
                 </android.support.design.widget.TextInputLayout>