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

register fixes

Browse Source
This commit is contained in:
mustafa içmen
2017-10-12 22:05:13 +03:00
parent a239736c9a
commit 50d9dd8ed8
11 changed files with 129 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java
View File

@@ -21,7 +21,6 @@ import ch.pizzalink.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.model.UserModel;
import ch.pizzalink.android.view.PizzalinkButton;
import ch.pizzalink.android.view.PizzalinkEditText;
import retrofit2.Call;
import retrofit2.Callback;
@@ -37,7 +36,7 @@ public class LoginActivity extends BaseActivity {
@BindString(R.string.not_have_an_accaount) String notHaveAnAccountText;
@BindString(R.string.register_text) String registerText;
@BindString(R.string.alert_fill_all_fields) String fillAllFieldsText;
@BindString(R.string.alert_valid_email) String validEmailText;
@BindString(R.string.alert_invalid_email) String validEmailText;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -62,8 +61,10 @@ public class LoginActivity extends BaseActivity {
private void initViews(){
initRegisterTextView();
/*
emailPizzalinkEditText.getEditText().setText("aytaccici@gmail.com");
passwordPizzalinkEditText.getEditText().setText("3522625");
*/
}
private void initRegisterTextView(){

28
app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java
View File

@@ -19,7 +19,6 @@ import ch.pizzalink.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.model.UserModel;
import ch.pizzalink.android.view.PizzalinkButton;
import ch.pizzalink.android.view.PizzalinkEditText;
import ch.pizzalink.android.view.PizzalinkToolbar;
import retrofit2.Call;
@@ -33,14 +32,14 @@ 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.address2PizzalinkEditText,
R.id.cityPizzalinkEditText, R.id.postcodePizzalinkEditText,
R.id.zonePizzalinkEditText, R.id.countryPizzalinkEditText})
R.id.address1PizzalinkEditText, R.id.cityPizzalinkEditText,
R.id.postcodePizzalinkEditText})
List<PizzalinkEditText> pizzalinkEditTextList;
@BindString(R.string.alert_fill_all_fields) String fillAllFieldsText;
@BindString(R.string.alert_valid_email) String validEmailText;
@BindString(R.string.alert_invalid_email) String validEmailText;
@BindString(R.string.alert_passwords_not_matched) String passwordsNotMatchedText;
@BindString(R.string.alert_invalid_post_code) String invalidPostCodeText;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -48,7 +47,7 @@ public class RegisterActivity extends BaseActivity {
setContentView(R.layout.activity_register);
ButterKnife.bind(this);
initViews();
setTestFields();
//setTestFields();
}
@OnClick(R.id.registerButton)
@@ -93,6 +92,11 @@ public class RegisterActivity extends BaseActivity {
return false;
}
if(pizzalinkEditTextList.get(8).getText().length() != 4){
DialogHelper.showAlertDialog(this, invalidPostCodeText);
return false;
}
return true;
}
@@ -102,9 +106,8 @@ public class RegisterActivity extends BaseActivity {
pizzalinkEditTextList.get(0).getText(), pizzalinkEditTextList.get(1).getText(),
pizzalinkEditTextList.get(2).getText(), pizzalinkEditTextList.get(3).getText(),
pizzalinkEditTextList.get(4).getText(), pizzalinkEditTextList.get(5).getText(),
pizzalinkEditTextList.get(6).getText(), pizzalinkEditTextList.get(7).getText(),
pizzalinkEditTextList.get(8).getText(), pizzalinkEditTextList.get(9).getText(),
pizzalinkEditTextList.get(10).getText(),pizzalinkEditTextList.get(11).getText());
pizzalinkEditTextList.get(6).getText(), "",
pizzalinkEditTextList.get(7).getText(), pizzalinkEditTextList.get(8).getText(), "1","1");
call.enqueue(new Callback<ResponseObject<UserModel>>() {
@Override
public void onResponse(Call<ResponseObject<UserModel>> call, Response<ResponseObject<UserModel>> response) {
@@ -138,10 +141,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 address 2");
pizzalinkEditTextList.get(8).getEditText().setText("test");
pizzalinkEditTextList.get(9).getEditText().setText("1234");
pizzalinkEditTextList.get(10).getEditText().setText("1");
pizzalinkEditTextList.get(11).getEditText().setText("1");
pizzalinkEditTextList.get(7).getEditText().setText("test");
pizzalinkEditTextList.get(8).getEditText().setText("1234");
}
}

32
app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java
View File

@@ -4,7 +4,9 @@ import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Typeface;
import android.support.v4.content.ContextCompat;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
import android.util.AttributeSet;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
@@ -77,6 +79,10 @@ public class PizzalinkEditText extends LinearLayout implements View.OnClickListe
if (inputType == null)
inputType = "text";
switch (inputType){
case "name":
editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS |
InputType.TYPE_TEXT_FLAG_CAP_WORDS);
break;
case "password":
editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
break;
@@ -86,8 +92,32 @@ public class PizzalinkEditText extends LinearLayout implements View.OnClickListe
case "email":
editText.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
break;
case "number":
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);
editText.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
@Override
public void afterTextChanged(Editable editable) {
// if edittext has 10chars & this is not called yet, add new line
if(editText.getText().length() == 40 * editText.getLineCount()) {
editText.append("\n");
}
}
});
break;
default:
editText.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_CLASS_TEXT);
editText.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_CLASS_TEXT |
InputType.TYPE_TEXT_FLAG_CAP_SENTENCES);
break;
}
}