Merge branch 'feat/develop'

gleb7499 · Nov 23, 2024 · 056d523 · 056d523
2 parents 6ffa436 + 724b889
commit 056d523
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/LifeLine/app/src/main/java/com/example/lifeline/AuthHelloActivity.java b/LifeLine/app/src/main/java/com/example/lifeline/AuthHelloActivity.java
@@ -53,9 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mAuth = FirebaseAuth.getInstance();
 
-        nextButton.setOnClickListener(v -> {
-            nextButtonClick();
-        });
+        nextButton.setOnClickListener(v -> nextButtonClick());
 
         if (savedInstanceState == null) {
             nextFragment(fragments.get(counterFragments++));
@@ -64,15 +62,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
     private void nextButtonClick() {
         if (counterFragments == fragments.size()) {
-            if (password.isEmpty()) {
+            if (password == null || password.isEmpty()) {
                 Toast.makeText(AuthHelloActivity.this, "Введите пароль", Toast.LENGTH_SHORT).show();
             }
             else if (isRegister) {
                 registerUser();
             } else {
                 loginUser();
             }
-        } else if (counterFragments == fragments.size() - 1 && (email.isEmpty() || !Patterns.EMAIL_ADDRESS.matcher(email).matches())) {
+        } else if (counterFragments == fragments.size() - 1 && (email == null || email.isEmpty() || !Patterns.EMAIL_ADDRESS.matcher(email).matches())) {
             Toast.makeText(AuthHelloActivity.this, "Неверный email", Toast.LENGTH_SHORT).show();
         } else {
             nextFragment(fragments.get(counterFragments++));
@@ -86,9 +84,7 @@ protected void addFragmentsInList(boolean isHelloFragment) {
             fragments.add(new YouIsHeroFragment());
             fragments.add(new ThanksFragment());
         }
-        fragments.add(EmailFragment.newInstance((data) -> {
-            email = data;
-        }));
+        fragments.add(EmailFragment.newInstance(data -> email = data));
         fragments.add(SignFragment.newInstance((data, isRegister) -> {
             password = data;
             AuthHelloActivity.this.isRegister = isRegister;
@@ -116,7 +112,6 @@ private void loginUser() {
         mAuth.signInWithEmailAndPassword(email, password).addOnCompleteListener(this, task -> {
             if (task.isSuccessful()) {
                 // Вход успешен
-                FirebaseUser user = mAuth.getCurrentUser();
                 Toast.makeText(AuthHelloActivity.this, "Вход успешен", Toast.LENGTH_LONG).show();
                 Intent intent = new Intent(AuthHelloActivity.this, DashboardActivity.class);
                 startActivity(intent);
@@ -150,7 +145,6 @@ private void registerUser() {
         mAuth.createUserWithEmailAndPassword(email, password).addOnCompleteListener(this, task -> {
             if (task.isSuccessful()) {
                 // Регистрация успешна
-                FirebaseUser user = mAuth.getCurrentUser();
                 Toast.makeText(AuthHelloActivity.this, "Регистрация успешна", Toast.LENGTH_LONG).show();
                 Intent intent = new Intent(AuthHelloActivity.this, DashboardActivity.class);
                 startActivity(intent);

diff --git a/LifeLine/app/src/main/java/com/example/lifeline/DashboardActivity.java b/LifeLine/app/src/main/java/com/example/lifeline/DashboardActivity.java
@@ -7,6 +7,7 @@
 import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.example.lifeline.authentication.AuthActivity;
 import com.google.firebase.auth.FirebaseAuth;
 
 public class DashboardActivity extends AppCompatActivity {
@@ -20,7 +21,7 @@ protected void onCreate(Bundle savedInstanceState) {
         Button buttonOutOfSystem = findViewById(R.id.buttonOutOfSystem);
         buttonOutOfSystem.setOnClickListener(v -> {
             FirebaseAuth.getInstance().signOut();
-            Intent intent = new Intent(DashboardActivity.this, MainActivity.class);
+            Intent intent = new Intent(DashboardActivity.this, AuthActivity.class);
             startActivity(intent);
             finish();
         });