volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

register fix

Browse Source
This commit is contained in:
cimenmus
2017-10-26 22:37:29 +03:00
parent 07713aff1c
commit 6c8940b6bf
4 changed files with 37 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java
+30 -40
View File
@@ -28,7 +28,7 @@ import ch.pizzalink.android.helper.ViewHelper;
import ch.pizzalink.android.model.CityModel; import ch.pizzalink.android.model.CityModel;
import ch.pizzalink.android.model.CountryModel; import ch.pizzalink.android.model.CountryModel;
import ch.pizzalink.android.model.UserModel; 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.PizzalinkDropdownView;
import ch.pizzalink.android.view.PizzalinkEditText; import ch.pizzalink.android.view.PizzalinkEditText;
import retrofit2.Call; import retrofit2.Call;
@@ -47,7 +47,7 @@ public class RegisterActivity extends BaseActivity {
@BindView(R.id.cityPizzalinkDropdown) PizzalinkDropdownView cityPizzalinkDropdown; @BindView(R.id.cityPizzalinkDropdown) PizzalinkDropdownView cityPizzalinkDropdown;
@BindView(R.id.postcodePizzalinkDrowpdown) PizzalinkDropdownView postcodePizzalinkDrowpdown; @BindView(R.id.postcodePizzalinkDrowpdown) PizzalinkDropdownView postcodePizzalinkDrowpdown;
@BindView(R.id.countryPizzalinkDropdown) PizzalinkDropdownView countryPizzalinkDropdown; @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_fill_all_fields) String fillAllFieldsText;
@BindString(R.string.alert_invalid_email) String validEmailText; @BindString(R.string.alert_invalid_email) String validEmailText;
@@ -58,10 +58,10 @@ public class RegisterActivity extends BaseActivity {
private ArrayList<CityModel> cityList = new ArrayList<>(); private ArrayList<CityModel> cityList = new ArrayList<>();
private ArrayList<CountryModel> countryList = new ArrayList<>(); private ArrayList<CountryModel> countryList = new ArrayList<>();
private ArrayList<ZoneeModel> zoneeList = new ArrayList<>(); private ArrayList<ZoneModel> zoneList = new ArrayList<>();
private CityModel selectedCityModel; private CityModel selectedCityModel;
private CountryModel selectedCountryModel; private CountryModel selectedCountryModel;
private ZoneeModel selectedZoneeModel; private ZoneModel selectedZoneModel;
private int activeRequestCount = 0; private int activeRequestCount = 0;
private ReentrantLock lock = new ReentrantLock(); private ReentrantLock lock = new ReentrantLock();
@@ -73,11 +73,11 @@ public class RegisterActivity extends BaseActivity {
ButterKnife.bind(this); ButterKnife.bind(this);
getCityList(); getCityList();
getCountryList(); getCountryList();
setTestFields(); //setTestFields();
} }
@OnClick({R.id.cityPizzalinkDropdown, R.id.postcodePizzalinkDrowpdown, @OnClick({R.id.cityPizzalinkDropdown, R.id.postcodePizzalinkDrowpdown,
R.id.countryPizzalinkDropdown, R.id.zoneePizzalinkDropdown, R.id.countryPizzalinkDropdown, R.id.zonePizzalinkDropdown,
R.id.registerButton}) R.id.registerButton})
protected void onClick(View view){ protected void onClick(View view){
switch (view.getId()){ switch (view.getId()){
@@ -87,9 +87,9 @@ public class RegisterActivity extends BaseActivity {
case R.id.countryPizzalinkDropdown: case R.id.countryPizzalinkDropdown:
showCountryDialog(); showCountryDialog();
break; break;
case R.id.zoneePizzalinkDropdown: case R.id.zonePizzalinkDropdown:
if(selectedCountryModel != null){ if(selectedCountryModel != null){
getZoneeList(); getZoneList();
} }
else { else {
DialogHelper.showAlertDialog(BaseActivity.currentActivity, selectCountryFirstText); DialogHelper.showAlertDialog(BaseActivity.currentActivity, selectCountryFirstText);
@@ -130,18 +130,9 @@ public class RegisterActivity extends BaseActivity {
return false; return false;
} }
if(cityPizzalinkDropdown.isEmpty() ||
postcodePizzalinkDrowpdown.isEmpty() ||
countryPizzalinkDropdown.isEmpty() ||
zoneePizzalinkDropdown.isEmpty()){
DialogHelper.showAlertDialog(this, fillAllFieldsText);
return false;
}
if(selectedCityModel == null || if(selectedCityModel == null ||
selectedCountryModel == null || selectedCountryModel == null ||
selectedZoneeModel == null){ selectedZoneModel == null){
DialogHelper.showAlertDialog(this, fillAllFieldsText); DialogHelper.showAlertDialog(this, fillAllFieldsText);
return false; return false;
} }
@@ -226,17 +217,17 @@ public class RegisterActivity extends BaseActivity {
}); });
} }
private void getZoneeList(){ private void getZoneList(){
DialogHelper.showLoadingDialog(); DialogHelper.showLoadingDialog();
Call<ResponseArray<ZoneeModel>> call = ApiService.apiInterface.getZoneeList(selectedCountryModel.getId()); Call<ResponseArray<ZoneModel>> call = ApiService.apiInterface.getZoneList(selectedCountryModel.getId());
call.enqueue(new Callback<ResponseArray<ZoneeModel>>() { call.enqueue(new Callback<ResponseArray<ZoneModel>>() {
@Override @Override
public void onResponse(Call<ResponseArray<ZoneeModel>> call, Response<ResponseArray<ZoneeModel>> response) { public void onResponse(Call<ResponseArray<ZoneModel>> call, Response<ResponseArray<ZoneModel>> response) {
DialogHelper.hideLoadingDialog(); DialogHelper.hideLoadingDialog();
if(response.isSuccessful() && if(response.isSuccessful() &&
response.body().getData() != null && response.body().getData() != null &&
response.body().isSuccess()){ response.body().isSuccess()){
fillAndNotifyZoneeList(response.body().getData()); fillAndShowZoneList(response.body().getData());
} }
else { else {
ApiErrorUtils.parseError(response); ApiErrorUtils.parseError(response);
@@ -244,7 +235,7 @@ public class RegisterActivity extends BaseActivity {
} }
@Override @Override
public void onFailure(Call<ResponseArray<ZoneeModel>> call, Throwable t) { public void onFailure(Call<ResponseArray<ZoneModel>> call, Throwable t) {
DialogHelper.hideLoadingDialog(); DialogHelper.hideLoadingDialog();
DialogHelper.showFailedDialog(); DialogHelper.showFailedDialog();
} }
@@ -263,11 +254,11 @@ public class RegisterActivity extends BaseActivity {
countryList.addAll(countries); countryList.addAll(countries);
} }
private void fillAndNotifyZoneeList(ArrayList<ZoneeModel> zonees){ private void fillAndShowZoneList(ArrayList<ZoneModel> zones){
ZoneeModel.checkNull(zonees); ZoneModel.checkNull(zones);
zoneeList.clear(); zoneList.clear();
zoneeList.addAll(zonees); zoneList.addAll(zones);
showZoneeDialog(); showZoneDialog();
} }
private void registerUser(){ private void registerUser(){
@@ -312,7 +303,7 @@ public class RegisterActivity extends BaseActivity {
params.put("city", selectedCityModel.getCity()); params.put("city", selectedCityModel.getCity());
params.put("postcode", selectedCityModel.getPostcode()); params.put("postcode", selectedCityModel.getPostcode());
params.put("country_id", selectedCountryModel.getId()); params.put("country_id", selectedCountryModel.getId());
params.put("zone_id", selectedZoneeModel.getZoneId()); params.put("zone_id", selectedZoneModel.getZoneId());
return params; return params;
} }
@@ -349,18 +340,18 @@ public class RegisterActivity extends BaseActivity {
}); });
} }
private void showZoneeDialog(){ private void showZoneDialog(){
final ArrayList<String> zoneeNameList = new ArrayList<>(); final ArrayList<String> zoneNameList = new ArrayList<>();
for(ZoneeModel zonee : zoneeList){ for(ZoneModel zone : zoneList){
zoneeNameList.add(zonee.getName()); zoneNameList.add(zone.getName());
} }
DialogHelper.showListDialog(zoneeNameList, new MaterialDialog.ListCallback() { DialogHelper.showListDialog(zoneNameList, new MaterialDialog.ListCallback() {
@Override @Override
public void onSelection(MaterialDialog dialog, View itemView, int position, CharSequence text) { public void onSelection(MaterialDialog dialog, View itemView, int position, CharSequence text) {
selectedZoneeModel = zoneeList.get(position); selectedZoneModel = zoneList.get(position);
zoneePizzalinkDropdown.setText(selectedZoneeModel.getName()); zonePizzalinkDropdown.setText(selectedZoneModel.getName());
} }
}); });
} }
@@ -368,12 +359,11 @@ public class RegisterActivity extends BaseActivity {
private void setTestFields(){ private void setTestFields(){
pizzalinkEditTextList.get(0).getEditText().setText("testname"); pizzalinkEditTextList.get(0).getEditText().setText("testname");
pizzalinkEditTextList.get(1).getEditText().setText("testsurname"); pizzalinkEditTextList.get(1).getEditText().setText("testsurname");
pizzalinkEditTextList.get(2).getEditText().setText("1234567891"); pizzalinkEditTextList.get(2).getEditText().setText("1234567892");
pizzalinkEditTextList.get(3).getEditText().setText("test4@test.com"); pizzalinkEditTextList.get(3).getEditText().setText("test5@test.com");
pizzalinkEditTextList.get(4).getEditText().setText("test"); pizzalinkEditTextList.get(4).getEditText().setText("test");
pizzalinkEditTextList.get(5).getEditText().setText("test"); pizzalinkEditTextList.get(5).getEditText().setText("test");
pizzalinkEditTextList.get(6).getEditText().setText("test address 1"); pizzalinkEditTextList.get(6).getEditText().setText("test address 1");
//postcodePizzalinkDrowpdown.setText("1234");
} }
private synchronized void increaseActiveRequestCount(){ private synchronized void increaseActiveRequestCount(){
app/src/main/java/ch/pizzalink/android/api/ApiInterface.java
+2 -2
View File
@@ -12,7 +12,7 @@ import ch.pizzalink.android.model.RemoveProductFromCartResponseModel;
import ch.pizzalink.android.model.ShippingMethodModel; import ch.pizzalink.android.model.ShippingMethodModel;
import ch.pizzalink.android.model.StoreInfoModel; import ch.pizzalink.android.model.StoreInfoModel;
import ch.pizzalink.android.model.CityModel; 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.cart.CartInfoModel;
import ch.pizzalink.android.model.CategoryModel; import ch.pizzalink.android.model.CategoryModel;
import ch.pizzalink.android.model.OrderModel; import ch.pizzalink.android.model.OrderModel;
@@ -116,7 +116,7 @@ public interface ApiInterface {
@FormUrlEncoded @FormUrlEncoded
@POST(ApiEndPoints.API_GET_ZONE_LIST) @POST(ApiEndPoints.API_GET_ZONE_LIST)
Call<ResponseArray<ZoneeModel>> getZoneeList(@Field("country_id") String countryId); Call<ResponseArray<ZoneModel>> getZoneList(@Field("country_id") String countryId);
@GET(ApiEndPoints.API_GET_CUSTOMER_PROFILE) @GET(ApiEndPoints.API_GET_CUSTOMER_PROFILE)
Call<ResponseObject<UserModel>> getCustomerProfile(@Query("token") String token); Call<ResponseObject<UserModel>> getCustomerProfile(@Query("token") String token);
app/src/main/java/ch/pizzalink/android/model/ZoneeModel.java → app/src/main/java/ch/pizzalink/android/model/ZoneModel.java
+4 -4
View File
@@ -9,7 +9,7 @@ import java.util.ArrayList;
* Created by cimenmus on 26.10.2017. * Created by cimenmus on 26.10.2017.
*/ */
public class ZoneeModel { public class ZoneModel {
@Expose @SerializedName("zone_id") private String zoneId; @Expose @SerializedName("zone_id") private String zoneId;
@Expose @SerializedName("country_id") private String countryId; @Expose @SerializedName("country_id") private String countryId;
@@ -41,9 +41,9 @@ public class ZoneeModel {
} }
} }
public static void checkNull(ArrayList<ZoneeModel> zoneeList){ public static void checkNull(ArrayList<ZoneModel> zoneList){
for(ZoneeModel zoneeModel : zoneeList){ for(ZoneModel zoneModel : zoneList){
zoneeModel.checkNull(); zoneModel.checkNull();
} }
} }
app/src/main/res/layout/activity_register.xml
+1 -1
View File
@@ -100,7 +100,7 @@
app:dropdownHintView="@string/country"/> app:dropdownHintView="@string/country"/>
<ch.pizzalink.android.view.PizzalinkDropdownView <ch.pizzalink.android.view.PizzalinkDropdownView
android:id="@+id/zoneePizzalinkDropdown" android:id="@+id/zonePizzalinkDropdown"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:dropdownHintView="@string/zone"/> app:dropdownHintView="@string/zone"/>