From e008b622fd727afa82b596ea060986d041101ed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=BB?=
 <119668441+Jiga228@users.noreply.github.com>
Date: Thu, 22 May 2025 22:56:25 +0700
Subject: [PATCH] Refactor and fix bug with create user

---
 .../tasktracker/Activities/LoginActivity.java | 22 ++++++++++++++-----
 app/src/main/res/values-en/strings.xml        |  1 +
 app/src/main/res/values-ru/strings.xml        |  3 ++-
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/example/tasktracker/Activities/LoginActivity.java b/app/src/main/java/com/example/tasktracker/Activities/LoginActivity.java
index 3d3fcb5..cef1e11 100644
--- a/app/src/main/java/com/example/tasktracker/Activities/LoginActivity.java
+++ b/app/src/main/java/com/example/tasktracker/Activities/LoginActivity.java
@@ -49,10 +49,14 @@ public class LoginActivity extends AppCompatActivity {
         binding.buttonSingIn.setOnClickListener(v->{
             login = binding.fieldLogin.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();
-            if(password.isEmpty())
+                return;
+            }
+            if(password.isEmpty()) {
                 Snackbar.make(binding.getRoot(), R.string.snackbar_EnterPassword, Snackbar.LENGTH_SHORT).show();
+                return;
+            }
 
             SingIn();
         });
@@ -60,10 +64,14 @@ public class LoginActivity extends AppCompatActivity {
         binding.buttonSingUp.setOnClickListener(v->{
             login = binding.fieldLogin.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();
-            if(password.isEmpty())
+                return;
+            }
+            if(password.isEmpty()) {
                 Snackbar.make(binding.getRoot(), R.string.snackbar_EnterPassword, Snackbar.LENGTH_SHORT).show();
+                return;
+            }
 
             SingUp();
         });
@@ -112,7 +120,11 @@ public class LoginActivity extends AppCompatActivity {
                     @Override
                     public void accept(LoginAnswer loginAnswer) throws Throwable {
                         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;
                         }
                         else if (loginAnswer.getStatus().equals("error")) {
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index b7eb23f..0405a7b 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -28,4 +28,5 @@
     <string name="hint_Yar">Year</string>
     <string name="hint_Hour">Hour</string>
     <string name="snackbar_BigLoginPassword">Login or password is too long.</string>
+    <string name="snackbar_SmallLoginPassword">Login or password is too small.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f9574a6..03a2a0f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -13,7 +13,7 @@
     <string name="hint_TaskName">Название задачи</string>
     <string name="hint_TaskDescription">Описание</string>
     <string name="hint_Minute">Минута</string>
-    <string name="snackbar_EnterLogin">Введите логи</string>
+    <string name="snackbar_EnterLogin">Введите логин</string>
     <string name="snackbar_EnterPassword">Введите пароль</string>
     <string name="snackbar_InvalidLogin">Неправильный логин или пароль</string>
     <string name="snackbar_AlredyCreated">Этот аккаунт уже создан</string>
@@ -28,4 +28,5 @@
     <string name="hint_Yar">Год</string>
     <string name="hint_Hour">Час</string>
     <string name="snackbar_BigLoginPassword">Логин или пороль слишком длинный.</string>
+    <string name="snackbar_SmallLoginPassword">Логин или пороль слишком короткий.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0ac0c9e..99361f6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,5 +35,6 @@
     <string name="snackbar_EnterName">Enter task name</string>
     <string name="snackbar_DataBaseError">Something went wrong.</string>
     <string name="snackbar_BigLoginPassword">Login or password is too long.</string>
+    <string name="snackbar_SmallLoginPassword">Login or password is too small.</string>
 
 </resources>
\ No newline at end of file