From 6c8940b6bf7f4034cd416770922b35c811e5301d Mon Sep 17 00:00:00 2001 From: cimenmus Date: Thu, 26 Oct 2017 22:37:29 +0300 Subject: [PATCH] register fix --- .../android/activity/RegisterActivity.java | 70 ++++++++----------- .../pizzalink/android/api/ApiInterface.java | 4 +- .../model/{ZoneeModel.java => ZoneModel.java} | 8 +-- app/src/main/res/layout/activity_register.xml | 2 +- 4 files changed, 37 insertions(+), 47 deletions(-) rename app/src/main/java/ch/pizzalink/android/model/{ZoneeModel.java => ZoneModel.java} (89%) diff --git a/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java b/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java index f9fe85d..ae80909 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java @@ -28,7 +28,7 @@ import ch.pizzalink.android.helper.ViewHelper; import ch.pizzalink.android.model.CityModel; import ch.pizzalink.android.model.CountryModel; import ch.pizzalink.android.model.UserModel; -import ch.pizzalink.android.model.ZoneeModel; +import ch.pizzalink.android.model.ZoneModel; import ch.pizzalink.android.view.PizzalinkDropdownView; import ch.pizzalink.android.view.PizzalinkEditText; import retrofit2.Call; @@ -47,7 +47,7 @@ public class RegisterActivity extends BaseActivity { @BindView(R.id.cityPizzalinkDropdown) PizzalinkDropdownView cityPizzalinkDropdown; @BindView(R.id.postcodePizzalinkDrowpdown) PizzalinkDropdownView postcodePizzalinkDrowpdown; @BindView(R.id.countryPizzalinkDropdown) PizzalinkDropdownView countryPizzalinkDropdown; - @BindView(R.id.zoneePizzalinkDropdown) PizzalinkDropdownView zoneePizzalinkDropdown; + @BindView(R.id.zonePizzalinkDropdown) PizzalinkDropdownView zonePizzalinkDropdown; @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @BindString(R.string.alert_invalid_email) String validEmailText; @@ -58,10 +58,10 @@ public class RegisterActivity extends BaseActivity { private ArrayList cityList = new ArrayList<>(); private ArrayList countryList = new ArrayList<>(); - private ArrayList zoneeList = new ArrayList<>(); + private ArrayList zoneList = new ArrayList<>(); private CityModel selectedCityModel; private CountryModel selectedCountryModel; - private ZoneeModel selectedZoneeModel; + private ZoneModel selectedZoneModel; private int activeRequestCount = 0; private ReentrantLock lock = new ReentrantLock(); @@ -73,11 +73,11 @@ public class RegisterActivity extends BaseActivity { ButterKnife.bind(this); getCityList(); getCountryList(); - setTestFields(); + //setTestFields(); } @OnClick({R.id.cityPizzalinkDropdown, R.id.postcodePizzalinkDrowpdown, - R.id.countryPizzalinkDropdown, R.id.zoneePizzalinkDropdown, + R.id.countryPizzalinkDropdown, R.id.zonePizzalinkDropdown, R.id.registerButton}) protected void onClick(View view){ switch (view.getId()){ @@ -87,9 +87,9 @@ public class RegisterActivity extends BaseActivity { case R.id.countryPizzalinkDropdown: showCountryDialog(); break; - case R.id.zoneePizzalinkDropdown: + case R.id.zonePizzalinkDropdown: if(selectedCountryModel != null){ - getZoneeList(); + getZoneList(); } else { DialogHelper.showAlertDialog(BaseActivity.currentActivity, selectCountryFirstText); @@ -130,18 +130,9 @@ public class RegisterActivity extends BaseActivity { return false; } - if(cityPizzalinkDropdown.isEmpty() || - postcodePizzalinkDrowpdown.isEmpty() || - countryPizzalinkDropdown.isEmpty() || - zoneePizzalinkDropdown.isEmpty()){ - DialogHelper.showAlertDialog(this, fillAllFieldsText); - return false; - } - - if(selectedCityModel == null || selectedCountryModel == null || - selectedZoneeModel == null){ + selectedZoneModel == null){ DialogHelper.showAlertDialog(this, fillAllFieldsText); return false; } @@ -226,17 +217,17 @@ public class RegisterActivity extends BaseActivity { }); } - private void getZoneeList(){ + private void getZoneList(){ DialogHelper.showLoadingDialog(); - Call> call = ApiService.apiInterface.getZoneeList(selectedCountryModel.getId()); - call.enqueue(new Callback>() { + Call> call = ApiService.apiInterface.getZoneList(selectedCountryModel.getId()); + call.enqueue(new Callback>() { @Override - public void onResponse(Call> call, Response> response) { + public void onResponse(Call> call, Response> response) { DialogHelper.hideLoadingDialog(); if(response.isSuccessful() && response.body().getData() != null && response.body().isSuccess()){ - fillAndNotifyZoneeList(response.body().getData()); + fillAndShowZoneList(response.body().getData()); } else { ApiErrorUtils.parseError(response); @@ -244,7 +235,7 @@ public class RegisterActivity extends BaseActivity { } @Override - public void onFailure(Call> call, Throwable t) { + public void onFailure(Call> call, Throwable t) { DialogHelper.hideLoadingDialog(); DialogHelper.showFailedDialog(); } @@ -263,11 +254,11 @@ public class RegisterActivity extends BaseActivity { countryList.addAll(countries); } - private void fillAndNotifyZoneeList(ArrayList zonees){ - ZoneeModel.checkNull(zonees); - zoneeList.clear(); - zoneeList.addAll(zonees); - showZoneeDialog(); + private void fillAndShowZoneList(ArrayList zones){ + ZoneModel.checkNull(zones); + zoneList.clear(); + zoneList.addAll(zones); + showZoneDialog(); } private void registerUser(){ @@ -312,7 +303,7 @@ public class RegisterActivity extends BaseActivity { params.put("city", selectedCityModel.getCity()); params.put("postcode", selectedCityModel.getPostcode()); params.put("country_id", selectedCountryModel.getId()); - params.put("zone_id", selectedZoneeModel.getZoneId()); + params.put("zone_id", selectedZoneModel.getZoneId()); return params; } @@ -349,18 +340,18 @@ public class RegisterActivity extends BaseActivity { }); } - private void showZoneeDialog(){ + private void showZoneDialog(){ - final ArrayList zoneeNameList = new ArrayList<>(); - for(ZoneeModel zonee : zoneeList){ - zoneeNameList.add(zonee.getName()); + final ArrayList zoneNameList = new ArrayList<>(); + for(ZoneModel zone : zoneList){ + zoneNameList.add(zone.getName()); } - DialogHelper.showListDialog(zoneeNameList, new MaterialDialog.ListCallback() { + DialogHelper.showListDialog(zoneNameList, new MaterialDialog.ListCallback() { @Override public void onSelection(MaterialDialog dialog, View itemView, int position, CharSequence text) { - selectedZoneeModel = zoneeList.get(position); - zoneePizzalinkDropdown.setText(selectedZoneeModel.getName()); + selectedZoneModel = zoneList.get(position); + zonePizzalinkDropdown.setText(selectedZoneModel.getName()); } }); } @@ -368,12 +359,11 @@ public class RegisterActivity extends BaseActivity { private void setTestFields(){ pizzalinkEditTextList.get(0).getEditText().setText("testname"); pizzalinkEditTextList.get(1).getEditText().setText("testsurname"); - pizzalinkEditTextList.get(2).getEditText().setText("1234567891"); - pizzalinkEditTextList.get(3).getEditText().setText("test4@test.com"); + pizzalinkEditTextList.get(2).getEditText().setText("1234567892"); + pizzalinkEditTextList.get(3).getEditText().setText("test5@test.com"); pizzalinkEditTextList.get(4).getEditText().setText("test"); pizzalinkEditTextList.get(5).getEditText().setText("test"); pizzalinkEditTextList.get(6).getEditText().setText("test address 1"); - //postcodePizzalinkDrowpdown.setText("1234"); } private synchronized void increaseActiveRequestCount(){ diff --git a/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java b/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java index 4dd1f75..7e848f2 100644 --- a/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java @@ -12,7 +12,7 @@ import ch.pizzalink.android.model.RemoveProductFromCartResponseModel; import ch.pizzalink.android.model.ShippingMethodModel; import ch.pizzalink.android.model.StoreInfoModel; import ch.pizzalink.android.model.CityModel; -import ch.pizzalink.android.model.ZoneeModel; +import ch.pizzalink.android.model.ZoneModel; import ch.pizzalink.android.model.cart.CartInfoModel; import ch.pizzalink.android.model.CategoryModel; import ch.pizzalink.android.model.OrderModel; @@ -116,7 +116,7 @@ public interface ApiInterface { @FormUrlEncoded @POST(ApiEndPoints.API_GET_ZONE_LIST) - Call> getZoneeList(@Field("country_id") String countryId); + Call> getZoneList(@Field("country_id") String countryId); @GET(ApiEndPoints.API_GET_CUSTOMER_PROFILE) Call> getCustomerProfile(@Query("token") String token); diff --git a/app/src/main/java/ch/pizzalink/android/model/ZoneeModel.java b/app/src/main/java/ch/pizzalink/android/model/ZoneModel.java similarity index 89% rename from app/src/main/java/ch/pizzalink/android/model/ZoneeModel.java rename to app/src/main/java/ch/pizzalink/android/model/ZoneModel.java index 48da617..4b1b30e 100644 --- a/app/src/main/java/ch/pizzalink/android/model/ZoneeModel.java +++ b/app/src/main/java/ch/pizzalink/android/model/ZoneModel.java @@ -9,7 +9,7 @@ import java.util.ArrayList; * Created by cimenmus on 26.10.2017. */ -public class ZoneeModel { +public class ZoneModel { @Expose @SerializedName("zone_id") private String zoneId; @Expose @SerializedName("country_id") private String countryId; @@ -41,9 +41,9 @@ public class ZoneeModel { } } - public static void checkNull(ArrayList zoneeList){ - for(ZoneeModel zoneeModel : zoneeList){ - zoneeModel.checkNull(); + public static void checkNull(ArrayList zoneList){ + for(ZoneModel zoneModel : zoneList){ + zoneModel.checkNull(); } } diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml index 8b10bcd..c770dd5 100644 --- a/app/src/main/res/layout/activity_register.xml +++ b/app/src/main/res/layout/activity_register.xml @@ -100,7 +100,7 @@ app:dropdownHintView="@string/country"/>