diff --git a/.gitignore b/.gitignore index 185d1bf..f3f8faf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.iml .gradle /local.properties /.idea/workspace.xml diff --git a/app/src/main/java/com/donor/oncall/DonorApi/DonorApi.java b/app/src/main/java/com/donor/oncall/DonorApi/DonorApi.java index 888def6..3a55724 100644 --- a/app/src/main/java/com/donor/oncall/DonorApi/DonorApi.java +++ b/app/src/main/java/com/donor/oncall/DonorApi/DonorApi.java @@ -19,6 +19,7 @@ public interface DonorApi { void login(@Body JsonObject jsonVal, Callback callback); + @Headers("Content-Type: application/json") @POST("/register") void register(@Body JsonObject jsonVal, Callback callback); diff --git a/app/src/main/java/com/donor/oncall/DonorApi/ServiceGenerator.java b/app/src/main/java/com/donor/oncall/DonorApi/ServiceGenerator.java index d48c587..1f1dbe9 100644 --- a/app/src/main/java/com/donor/oncall/DonorApi/ServiceGenerator.java +++ b/app/src/main/java/com/donor/oncall/DonorApi/ServiceGenerator.java @@ -10,9 +10,11 @@ */ public class ServiceGenerator { + public static final String production_domain = "http://45.55.137.90:8000"; public static final String debug_domain = "http://192.168.0.103:8000"; + private static RestAdapter.Builder builder = new RestAdapter.Builder() .setEndpoint(production_domain) .setClient(new OkClient(new OkHttpClient())); diff --git a/app/src/main/java/com/donor/oncall/fragments/LoginFragment.java b/app/src/main/java/com/donor/oncall/fragments/LoginFragment.java index 73cee28..7d3094e 100644 --- a/app/src/main/java/com/donor/oncall/fragments/LoginFragment.java +++ b/app/src/main/java/com/donor/oncall/fragments/LoginFragment.java @@ -101,14 +101,15 @@ public void setUpLogin(){ rootView.findViewById(R.id.signin).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + JsonObject jsonObject = new JsonObject(); if (validateEmailIdAndPassword()) { progressDialog.show(); try { - jsonObject.addProperty("userName", username); jsonObject.addProperty("password", password); + donorApi.login(jsonObject, new Callback() { @Override public void success(Response response, Response response2) { @@ -129,11 +130,13 @@ public void success(Response response, Response response2) { @Override public void failure(RetrofitError error) { + String json = new String(((TypedByteArray)error.getResponse().getBody()).getBytes()); JsonParser parser = new JsonParser(); JsonObject errorJson = parser.parse(json).getAsJsonObject(); passwordField.setError(errorJson.get("error").getAsString()); progressDialog.dismiss(); + } }); diff --git a/app/src/main/java/com/donor/oncall/fragments/MapViewFragment.java b/app/src/main/java/com/donor/oncall/fragments/MapViewFragment.java index f1e839b..f2c99f4 100644 --- a/app/src/main/java/com/donor/oncall/fragments/MapViewFragment.java +++ b/app/src/main/java/com/donor/oncall/fragments/MapViewFragment.java @@ -4,6 +4,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.location.Location; +import android.location.LocationListener; import android.location.LocationManager; import android.os.Bundle; import android.os.Handler; diff --git a/app/src/main/java/com/donor/oncall/fragments/RegisterationFragment.java b/app/src/main/java/com/donor/oncall/fragments/RegisterationFragment.java index 06e27b0..10e1198 100644 --- a/app/src/main/java/com/donor/oncall/fragments/RegisterationFragment.java +++ b/app/src/main/java/com/donor/oncall/fragments/RegisterationFragment.java @@ -141,7 +141,7 @@ public boolean checkPwd(){ if (isNullOrEmpty(password)){ if (isNullOrEmpty(cfrmpassword)){ if (!password.equals(cfrmpassword)){ - cfrmpwdField.setError("Passwords donot match"); + cfrmpwdField.setError("Passwords do not match"); status = false; } }else { @@ -182,7 +182,8 @@ public boolean checkPhoneNumber(){ if (!isNullOrEmpty(phnnumber)) { phnnumberField.setError("Phone Number cannot be empty"); - status =false; + + status = false; } return status; } @@ -222,19 +223,23 @@ public void onClick(View v) { if (validateFields()){ try { progressDialog.show(); + + jsonObject.addProperty("password", password); jsonObject.addProperty("name", name); jsonObject.addProperty("bloodGroup", bloodGrp); jsonObject.addProperty("dob", dob); jsonObject.addProperty("phoneNo",phnnumber); jsonObject.addProperty("email", email); + Log.d(TAG,jsonObject.toString()); donorApi.register(jsonObject,new Callback< Response >() { @Override public void success(Response response, Response response2) { Log.d(TAG, "Success " + response.getReason()); + progressDialog.setMessage("Thank you for Signin up"); - // String json = new String(((TypedByteArray) response.getBody()).getBytes()); + replaceViewFragment(new LoginFragment(),false); progressDialog.dismiss(); @@ -242,7 +247,6 @@ public void success(Response response, Response response2) { @Override public void failure(RetrofitError error) { - new AlertDialog.Builder(getContext()) .setTitle("User Already Exists") .setMessage("Email id has been already signed up. Please use forgot password to login.") diff --git a/app/src/main/res/layout/registeration_screen.xml b/app/src/main/res/layout/registeration_screen.xml index 09f5b25..3364af8 100644 --- a/app/src/main/res/layout/registeration_screen.xml +++ b/app/src/main/res/layout/registeration_screen.xml @@ -82,7 +82,8 @@ android:id="@+id/pwd" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="password" /> + android:hint="password" + android:password="true"/> + android:hint="confirm password" + android:password="true"/>