From 5e26f03a55e7c0041ea7c6cbb9b3272e42e70b93 Mon Sep 17 00:00:00 2001 From: cimenmus Date: Tue, 16 Jan 2018 23:04:28 +0300 Subject: [PATCH] bug fixes part 1 --- .../android/activity/AddAddressActivity.java | 22 +++++++++++----- .../android/activity/RegisterActivity.java | 26 ++++++++++++++----- .../android/view/PizzalinkEditText.java | 6 +++++ .../main/res/layout/activity_add_address.xml | 21 ++++++++------- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_register.xml | 19 ++++++++------ app/src/main/res/layout/fragment_cart.xml | 13 +++++----- 7 files changed, 71 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/ch/pizzalink/android/activity/AddAddressActivity.java b/app/src/main/java/ch/pizzalink/android/activity/AddAddressActivity.java index 370a59b..02f53b9 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/AddAddressActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/AddAddressActivity.java @@ -40,7 +40,7 @@ public class AddAddressActivity extends BaseActivity { @BindView(R.id.address1PizzalinkEditText) PizzalinkEditText address1PizzalinkEditText; @BindView(R.id.cityPizzalinkDropdown) PizzalinkDropdownView cityPizzalinkDropdown; - @BindView(R.id.postcodePizzalinkDrowpdown) PizzalinkDropdownView postcodePizzalinkDrowpdown; + @BindView(R.id.postcodePizzalinkEditText) PizzalinkEditText postcodePizzalinkEditText; @BindView(R.id.countryPizzalinkDropdown) PizzalinkDropdownView countryPizzalinkDropdown; @BindView(R.id.zonePizzalinkDropdown) PizzalinkDropdownView zonePizzalinkDropdown; @@ -64,7 +64,7 @@ public class AddAddressActivity extends BaseActivity { setContentView(R.layout.activity_add_address); ButterKnife.bind(this); getCityList(); - getCountryList(); + //getCountryList(); } @OnClick({R.id.cityPizzalinkDropdown, R.id.countryPizzalinkDropdown, @@ -95,6 +95,7 @@ public class AddAddressActivity extends BaseActivity { private boolean checkFields(){ + /* if(address1PizzalinkEditText.isEmail() || selectedCityModel == null || selectedCountryModel == null || @@ -102,7 +103,14 @@ public class AddAddressActivity extends BaseActivity { DialogHelper.showAlertDialog(this, fillAllFieldsText); return false; } + */ + if(address1PizzalinkEditText.isEmpty() || + selectedCityModel == null || + postcodePizzalinkEditText.isEmpty()){ + DialogHelper.showAlertDialog(this, fillAllFieldsText); + return false; + } return true; } @@ -239,7 +247,6 @@ public class AddAddressActivity extends BaseActivity { public void onSelection(MaterialDialog dialog, View itemView, int position, CharSequence text) { selectedCityModel = cityList.get(position); cityPizzalinkDropdown.setText(selectedCityModel.getCity()); - postcodePizzalinkDrowpdown.setText(selectedCityModel.getPostcode()); } }); } @@ -319,9 +326,12 @@ public class AddAddressActivity extends BaseActivity { params.put("address_1", address1PizzalinkEditText.getText()); params.put("address_2", ""); params.put("city", selectedCityModel.getCity()); - params.put("postcode", selectedCityModel.getPostcode()); - params.put("country_id", selectedCountryModel.getId()); - params.put("zone_id", selectedZoneModel.getZoneId()); + //params.put("postcode", selectedCityModel.getPostcode()); + params.put("postcode", postcodePizzalinkEditText.getText()); + //params.put("country_id", selectedCountryModel.getId()); + //params.put("zone_id", selectedZoneModel.getZoneId()); + params.put("country_id", "1"); + params.put("zone_id", "1"); return params; } 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 2bc546f..d7bb568 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java @@ -40,17 +40,17 @@ public class RegisterActivity extends BaseActivity { @BindViews({ R.id.firstnamePizzalinkEditText, R.id.lasstnamePizzalinkEditText, R.id.telephonePizzalinkEditText, R.id.emailPizzalinkEditText, R.id.passwordPizzalinkEditText, R.id.passwordAgainPizzalinkEditText, - R.id.address1PizzalinkEditText}) + R.id.address1PizzalinkEditText, R.id.postcodePizzalinkEditText}) List pizzalinkEditTextList; @BindView(R.id.cityPizzalinkDropdown) PizzalinkDropdownView cityPizzalinkDropdown; - @BindView(R.id.postcodePizzalinkDrowpdown) PizzalinkDropdownView postcodePizzalinkDrowpdown; @BindView(R.id.countryPizzalinkDropdown) PizzalinkDropdownView countryPizzalinkDropdown; @BindView(R.id.zonePizzalinkDropdown) PizzalinkDropdownView zonePizzalinkDropdown; @BindView(R.id.registerButton) Button registerButton; @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @BindString(R.string.alert_invalid_email) String validEmailText; + @BindString(R.string.alert_invalid_post_code) String invalidPostcodeText; @BindString(R.string.alert_passwords_not_matched) String passwordsNotMatchedText; @BindString(R.string.alert_select_country_first) String selectCountryFirstText; @@ -70,7 +70,7 @@ public class RegisterActivity extends BaseActivity { setContentView(R.layout.activity_register); ButterKnife.bind(this); getCityList(); - getCountryList(); + //getCountryList(); //setTestFields(); } @@ -127,10 +127,20 @@ public class RegisterActivity extends BaseActivity { return false; } + if(pizzalinkEditTextList.get(7).getText().length() != 4){ + DialogHelper.showAlertDialog(this, invalidPostcodeText); + return false; + } + + /* if(selectedCityModel == null || selectedCountryModel == null || selectedZoneModel == null){ DialogHelper.showAlertDialog(this, fillAllFieldsText); + */ + + if(selectedCityModel == null){ + DialogHelper.showAlertDialog(this, fillAllFieldsText); return false; } @@ -298,9 +308,11 @@ public class RegisterActivity extends BaseActivity { params.put("address_1", pizzalinkEditTextList.get(6).getText()); params.put("address_2", ""); params.put("city", selectedCityModel.getCity()); - params.put("postcode", selectedCityModel.getPostcode()); - params.put("country_id", selectedCountryModel.getId()); - params.put("zone_id", selectedZoneModel.getZoneId()); + params.put("postcode", pizzalinkEditTextList.get(7).getText()); + //params.put("country_id", selectedCountryModel.getId()); + //params.put("zone_id", selectedZoneModel.getZoneId()); + params.put("country_id", "1"); + params.put("zone_id", "1"); return params; } @@ -316,7 +328,6 @@ public class RegisterActivity extends BaseActivity { public void onSelection(MaterialDialog dialog, View itemView, int position, CharSequence text) { selectedCityModel = cityList.get(position); cityPizzalinkDropdown.setText(selectedCityModel.getCity()); - postcodePizzalinkDrowpdown.setText(selectedCityModel.getPostcode()); } }); } @@ -361,6 +372,7 @@ public class RegisterActivity extends BaseActivity { pizzalinkEditTextList.get(4).getEditText().setText("test"); pizzalinkEditTextList.get(5).getEditText().setText("test"); pizzalinkEditTextList.get(6).getEditText().setText("test address 1"); + pizzalinkEditTextList.get(7).getEditText().setText("test postcode"); } private synchronized void increaseActiveRequestCount(){ diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java b/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java index dcc4b81..0d9422a 100644 --- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java +++ b/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java @@ -5,6 +5,7 @@ import android.content.res.TypedArray; import android.graphics.Typeface; import android.support.v4.content.ContextCompat; import android.text.Editable; +import android.text.InputFilter; import android.text.InputType; import android.text.TextWatcher; import android.util.AttributeSet; @@ -105,6 +106,11 @@ public class PizzalinkEditText extends LinearLayout implements View.OnClickListe case "number": editText.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_CLASS_NUMBER); break; + case "postcode": + int maxLength = 4; + editText.setFilters(new InputFilter[] {new InputFilter.LengthFilter(maxLength)}); + editText.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_CLASS_NUMBER); + break; case "address": editText.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_WORDS | InputType.TYPE_TEXT_FLAG_MULTI_LINE); diff --git a/app/src/main/res/layout/activity_add_address.xml b/app/src/main/res/layout/activity_add_address.xml index c827075..556030f 100644 --- a/app/src/main/res/layout/activity_add_address.xml +++ b/app/src/main/res/layout/activity_add_address.xml @@ -64,6 +64,14 @@ app:inputType="address" app:hint="@string/addres_line_1"/> + + - - + app:dropdownHintView="@string/country" + android:visibility="gone"/> + app:dropdownHintView="@string/zone" + android:visibility="gone"/> diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml index 555021e..1867efe 100644 --- a/app/src/main/res/layout/activity_register.xml +++ b/app/src/main/res/layout/activity_register.xml @@ -90,29 +90,32 @@ app:inputType="address" app:hint="@string/addres_line_1"/> + + - - + app:dropdownHintView="@string/country" + android:visibility="gone"/> + app:dropdownHintView="@string/zone" + android:visibility="gone"/> + android:visibility="visible"> + android:background="@drawable/shadow" + android:visibility="gone"/> + android:background="@color/ghost_white"> + android:layout_gravity="center_horizontal"/>