Merge branch 'feat/develop'

gleb7499 · Dec 15, 2024 · 3cfce4a · 3cfce4a
2 parents 63be6e9 + 4c079a8
commit 3cfce4a
Show file tree

Hide file tree

Showing 53 changed files with 3,094 additions and 356 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,4 @@ local.properties
 *.json
 *~
 **/build
-**/reports
+**/reports
diff --git a/LifeLine/app/src/main/AndroidManifest.xml b/LifeLine/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".DashboardActivity"
+            android:name=".dashboard.DashboardActivity"
             android:exported="false" />
         <activity
             android:name=".hello.HelloActivity"

diff --git a/LifeLine/app/src/main/java/com/example/lifeline/AuthHelloActivity.java b/LifeLine/app/src/main/java/com/example/lifeline/AuthHelloActivity.java
diff --git a/LifeLine/app/src/main/java/com/example/lifeline/DashboardActivity.java b/LifeLine/app/src/main/java/com/example/lifeline/DashboardActivity.java
diff --git a/LifeLine/app/src/main/java/com/example/lifeline/MainActivity.java b/LifeLine/app/src/main/java/com/example/lifeline/MainActivity.java
@@ -1,24 +1,22 @@
 package com.example.lifeline;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 
-import androidx.activity.result.ActivityResult;
-import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.example.lifeline.authentication.AuthActivity;
+import com.example.lifeline.dashboard.DashboardActivity;
+import com.example.lifeline.database.DatabaseManager;
 import com.example.lifeline.hello.HelloActivity;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 
-import org.jetbrains.annotations.Contract;
-
 public class MainActivity extends AppCompatActivity {
 
     private ActivityResultLauncher<Intent> launcherForHelloActivity;
@@ -27,30 +25,42 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         FirebaseApp.initializeApp(this);
 
-        launcherForHelloActivity = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), o -> {});
-        launcherForAuthActivity = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), o -> {});
+        DatabaseManager.setDatabase(this);
+
+        // Запустить активити входа в систему
+        launcherForHelloActivity = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            if (result.getResultCode() == Activity.RESULT_OK) {
+                FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
+                if (user == null || user.isAnonymous()) {
+                    // Запустить активити входа в систему
+                    launcherForAuthActivity.launch(new Intent(this, AuthActivity.class));
+                } else {
+                    startActivity(new Intent(this, DashboardActivity.class));
+                    finish();
+                }
+            }
+        });
+        launcherForAuthActivity = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            if (result.getResultCode() == Activity.RESULT_OK) {
+                startActivity(new Intent(this, DashboardActivity.class));
+                finish();
+            }
+        });
 
+        FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
         if (isFirstRun()) {
             // Запустить приветственного активити
-            startActivity(newActivity(HelloActivity.class));
+            launcherForHelloActivity.launch(new Intent(this, HelloActivity.class));
+        } else if (user == null || user.isAnonymous()) {
+            // Запустить активити входа в систему
+            launcherForAuthActivity.launch(new Intent(this, AuthActivity.class));
         } else {
-            FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
-            if (user == null || user.isAnonymous()) {
-                // Запустить активити входа в систему
-                startActivity(newActivity(AuthActivity.class));
-            }
+            startActivity(new Intent(this, DashboardActivity.class));
+            finish();
         }
-        // Запустить основное активити только после успешной регистрации пользователя
-        startActivity(newActivity(DashboardActivity.class));
-        finish();
-    }
-
-    @NonNull
-    @Contract("_ -> new")
-    private Intent newActivity(Class<?> cls) {
-        return new Intent(this, cls);
     }
 
     private boolean isFirstRun() {

diff --git a/LifeLine/app/src/main/java/com/example/lifeline/adapters/RecyclerViewParamAdapter.java b/LifeLine/app/src/main/java/com/example/lifeline/adapters/RecyclerViewParamAdapter.java
@@ -0,0 +1,73 @@
+package com.example.lifeline.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.lifeline.R;
+import com.example.lifeline.models.RecyclerViewModel;
+
+import java.util.List;
+
+public class RecyclerViewParamAdapter extends RecyclerView.Adapter<RecyclerViewParamAdapter.paramViewHolder> {
+
+    private final Context context;
+    private final List<RecyclerViewModel> list;
+
+    public RecyclerViewParamAdapter(Context context, List<RecyclerViewModel> list) {
+        this.context = context;
+        this.list = list;
+    }
+
+    @NonNull
+    @Override
+    public paramViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(context).inflate(R.layout.recycler_view_param_item, parent, false);
+        return new paramViewHolder(view);
+    }
+
+    @Override
+    public int getItemCount() {
+        return (int) Math.ceil((float) list.size() / paramViewHolder.numberOfItemsInOneRow);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull paramViewHolder holder, int position) {
+        holder.textView_1.setText(list.get(position * paramViewHolder.numberOfItemsInOneRow).getValue());
+        holder.imageView_1.setImageResource(list.get(position * paramViewHolder.numberOfItemsInOneRow).getImage());
+
+        if (position * paramViewHolder.numberOfItemsInOneRow + 1 < list.size()) {
+            holder.textView_2.setText(list.get(position * paramViewHolder.numberOfItemsInOneRow + 1).getValue());
+            holder.imageView_2.setImageResource(list.get(position * paramViewHolder.numberOfItemsInOneRow + 1).getImage());
+        } else {
+            holder.cardView_2.setVisibility(View.GONE);
+        }
+    }
+
+    public static final class paramViewHolder extends RecyclerView.ViewHolder {
+
+        private final TextView textView_1;
+        private final TextView textView_2;
+        private final ImageView imageView_1;
+        private final ImageView imageView_2;
+        private final CardView cardView_2;
+        private static final int numberOfItemsInOneRow = 2;
+
+        public paramViewHolder(View view) {
+            super(view);
+
+            textView_1 = view.findViewById(R.id.textView_1);
+            textView_2 = view.findViewById(R.id.textView_2);
+            imageView_1 = view.findViewById(R.id.imageView_1);
+            imageView_2 = view.findViewById(R.id.imageView_2);
+            cardView_2 = view.findViewById(R.id.cardView_2);
+        }
+    }
+}
diff --git a/LifeLine/app/src/main/java/com/example/lifeline/authentication/AuthActivity.java b/LifeLine/app/src/main/java/com/example/lifeline/authentication/AuthActivity.java
@@ -2,7 +2,7 @@
 
 import android.os.Bundle;
 
-import com.example.lifeline.AuthHelloActivity;
+import com.example.lifeline.interfaces.AuthHelloActivity;
 
 public class AuthActivity extends AuthHelloActivity {