Refactor and fix bug with create user
This commit is contained in:
@@ -49,10 +49,14 @@ public class LoginActivity extends AppCompatActivity {
|
|||||||
binding.buttonSingIn.setOnClickListener(v->{
|
binding.buttonSingIn.setOnClickListener(v->{
|
||||||
login = binding.fieldLogin.getText().toString();
|
login = binding.fieldLogin.getText().toString();
|
||||||
password = binding.fieldPassword.getText().toString();
|
password = binding.fieldPassword.getText().toString();
|
||||||
if(login.isEmpty())
|
if(login.isEmpty()) {
|
||||||
Snackbar.make(binding.getRoot(), R.string.snackbar_EnterLogin, Snackbar.LENGTH_SHORT).show();
|
Snackbar.make(binding.getRoot(), R.string.snackbar_EnterLogin, Snackbar.LENGTH_SHORT).show();
|
||||||
if(password.isEmpty())
|
return;
|
||||||
|
}
|
||||||
|
if(password.isEmpty()) {
|
||||||
Snackbar.make(binding.getRoot(), R.string.snackbar_EnterPassword, Snackbar.LENGTH_SHORT).show();
|
Snackbar.make(binding.getRoot(), R.string.snackbar_EnterPassword, Snackbar.LENGTH_SHORT).show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
SingIn();
|
SingIn();
|
||||||
});
|
});
|
||||||
@@ -60,10 +64,14 @@ public class LoginActivity extends AppCompatActivity {
|
|||||||
binding.buttonSingUp.setOnClickListener(v->{
|
binding.buttonSingUp.setOnClickListener(v->{
|
||||||
login = binding.fieldLogin.getText().toString();
|
login = binding.fieldLogin.getText().toString();
|
||||||
password = binding.fieldPassword.getText().toString();
|
password = binding.fieldPassword.getText().toString();
|
||||||
if(login.isEmpty())
|
if(login.isEmpty()) {
|
||||||
Snackbar.make(binding.getRoot(), R.string.snackbar_EnterLogin, Snackbar.LENGTH_SHORT).show();
|
Snackbar.make(binding.getRoot(), R.string.snackbar_EnterLogin, Snackbar.LENGTH_SHORT).show();
|
||||||
if(password.isEmpty())
|
return;
|
||||||
|
}
|
||||||
|
if(password.isEmpty()) {
|
||||||
Snackbar.make(binding.getRoot(), R.string.snackbar_EnterPassword, Snackbar.LENGTH_SHORT).show();
|
Snackbar.make(binding.getRoot(), R.string.snackbar_EnterPassword, Snackbar.LENGTH_SHORT).show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
SingUp();
|
SingUp();
|
||||||
});
|
});
|
||||||
@@ -112,7 +120,11 @@ public class LoginActivity extends AppCompatActivity {
|
|||||||
@Override
|
@Override
|
||||||
public void accept(LoginAnswer loginAnswer) throws Throwable {
|
public void accept(LoginAnswer loginAnswer) throws Throwable {
|
||||||
if(loginAnswer.getStatus().equals("big")) {
|
if(loginAnswer.getStatus().equals("big")) {
|
||||||
Snackbar.make(binding.getRoot(), R.string.snackbar_InvalidLogin, Snackbar.LENGTH_SHORT).show();
|
Snackbar.make(binding.getRoot(), R.string.snackbar_BigLoginPassword, Snackbar.LENGTH_SHORT).show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if(loginAnswer.getStatus().equals("big")) {
|
||||||
|
Snackbar.make(binding.getRoot(), R.string.snackbar_SmallLoginPassword, Snackbar.LENGTH_SHORT).show();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (loginAnswer.getStatus().equals("error")) {
|
else if (loginAnswer.getStatus().equals("error")) {
|
||||||
|
|||||||
@@ -28,4 +28,5 @@
|
|||||||
<string name="hint_Yar">Year</string>
|
<string name="hint_Yar">Year</string>
|
||||||
<string name="hint_Hour">Hour</string>
|
<string name="hint_Hour">Hour</string>
|
||||||
<string name="snackbar_BigLoginPassword">Login or password is too long.</string>
|
<string name="snackbar_BigLoginPassword">Login or password is too long.</string>
|
||||||
|
<string name="snackbar_SmallLoginPassword">Login or password is too small.</string>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
<string name="hint_TaskName">Название задачи</string>
|
<string name="hint_TaskName">Название задачи</string>
|
||||||
<string name="hint_TaskDescription">Описание</string>
|
<string name="hint_TaskDescription">Описание</string>
|
||||||
<string name="hint_Minute">Минута</string>
|
<string name="hint_Minute">Минута</string>
|
||||||
<string name="snackbar_EnterLogin">Введите логи</string>
|
<string name="snackbar_EnterLogin">Введите логин</string>
|
||||||
<string name="snackbar_EnterPassword">Введите пароль</string>
|
<string name="snackbar_EnterPassword">Введите пароль</string>
|
||||||
<string name="snackbar_InvalidLogin">Неправильный логин или пароль</string>
|
<string name="snackbar_InvalidLogin">Неправильный логин или пароль</string>
|
||||||
<string name="snackbar_AlredyCreated">Этот аккаунт уже создан</string>
|
<string name="snackbar_AlredyCreated">Этот аккаунт уже создан</string>
|
||||||
@@ -28,4 +28,5 @@
|
|||||||
<string name="hint_Yar">Год</string>
|
<string name="hint_Yar">Год</string>
|
||||||
<string name="hint_Hour">Час</string>
|
<string name="hint_Hour">Час</string>
|
||||||
<string name="snackbar_BigLoginPassword">Логин или пороль слишком длинный.</string>
|
<string name="snackbar_BigLoginPassword">Логин или пороль слишком длинный.</string>
|
||||||
|
<string name="snackbar_SmallLoginPassword">Логин или пороль слишком короткий.</string>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -35,5 +35,6 @@
|
|||||||
<string name="snackbar_EnterName">Enter task name</string>
|
<string name="snackbar_EnterName">Enter task name</string>
|
||||||
<string name="snackbar_DataBaseError">Something went wrong.</string>
|
<string name="snackbar_DataBaseError">Something went wrong.</string>
|
||||||
<string name="snackbar_BigLoginPassword">Login or password is too long.</string>
|
<string name="snackbar_BigLoginPassword">Login or password is too long.</string>
|
||||||
|
<string name="snackbar_SmallLoginPassword">Login or password is too small.</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
Reference in New Issue
Block a user