fixed the conflicts

.gitignore

@@ -1,4 +1,15 @@
-.github/
-.gradle/
-.idea/
-gradle/
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties

app/src/main/AndroidManifest.xml

@@ -13,14 +13,14 @@
         android:theme="@style/Theme.TaskManager"
         tools:targetApi="31">
         <activity
-            android:name=".ModifyTaskActivity"
+            android:name=".Activity.ModifyTaskActivity"
             android:exported="false" >
         </activity>
         <activity
-            android:name=".CreateTaskActivity"
+            android:name=".Activity.CreateTaskActivity"
             android:exported="false" />
         <activity
-            android:name=".MainActivity"
+            android:name=".Activity.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/example/taskmanager/CreateTaskActivity.java → app/src/main/java/com/example/taskmanager/Activity/CreateTaskActivity.java

@@ -1,4 +1,4 @@
-package com.example.taskmanager;
+package com.example.taskmanager.Activity;
 
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -19,6 +19,9 @@
 import android.widget.TextView;
 import android.widget.TimePicker;
 import android.widget.Toast;
+
+import com.example.taskmanager.R;
+
 import java.time.LocalDate;
 
 public class CreateTaskActivity extends AppCompatActivity {

app/src/main/java/com/example/taskmanager/MainActivity.java → app/src/main/java/com/example/taskmanager/Activity/MainActivity.java

@@ -1,4 +1,4 @@
-package com.example.taskmanager;
+package com.example.taskmanager.Activity;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
@@ -10,7 +10,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageButton;
-
+import com.example.taskmanager.R;
 import com.example.taskmanager.ui.CompletedTaskFragment;
 import com.example.taskmanager.ui.CurrentTasksFragment;
 import com.google.android.material.navigation.NavigationView;

app/src/main/java/com/example/taskmanager/ModifyTaskActivity.java → app/src/main/java/com/example/taskmanager/Activity/ModifyTaskActivity.java

@@ -1,4 +1,4 @@
-package com.example.taskmanager;
+package com.example.taskmanager.Activity;
 
 import androidx.appcompat.app.AppCompatActivity;
 import android.app.AlertDialog;
@@ -20,12 +20,13 @@
 
 import com.example.taskmanager.ui.TaskModel;
 import com.google.android.material.snackbar.Snackbar;
+import com.example.taskmanager.R;
 
 import java.time.LocalDate;
 import java.util.Calendar;
 
 public class ModifyTaskActivity extends AppCompatActivity {
-    private  TextView titleLb;
+    private static TextView titleLb;
     private static EditText nameView;
     private static EditText descriptionView;
     private static Spinner prioritySpinner;

app/src/main/java/com/example/taskmanager/Adapter/TaskAdapter.java

@@ -7,12 +7,10 @@
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.example.taskmanager.ModifyTaskActivity;
+import com.example.taskmanager.Activity.ModifyTaskActivity;
 import com.example.taskmanager.R;
 import com.example.taskmanager.ui.TaskModel;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;

app/src/main/java/com/example/taskmanager/Utility/Task.java

@@ -0,0 +1,38 @@
+package com.example.taskmanager.Utility;
+
+public class Task {
+    private String title;
+    private String description;
+    private String priority;
+    private String date;
+    private String time;
+
+    public Task (String title, String description, String priority, String date, String time){
+        this.title = title;
+        this.description = description;
+        this.priority = priority;
+        this.date = date;
+        this.time = time;
+    }
+
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getPriority() {
+        return priority;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public String getTime() {
+        return time;
+    }
+}

app/src/main/res/layout/activity_create_task.xml

@@ -10,7 +10,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:context=".CreateTaskActivity">
+        tools:context=".Activity.CreateTaskActivity">
 
         <TextView
             android:id="@+id/textView"

app/src/main/res/layout/activity_main.xml

@@ -2,10 +2,10 @@
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawerLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
+    tools:context=".Activity.MainActivity"
+    android:id="@+id/drawerLayout"
     tools:openDrawer="start">
 
     <com.google.android.material.navigation.NavigationView

app/src/main/res/layout/activity_modify_task.xml

@@ -12,7 +12,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:context=".ModifyTaskActivity">
+        tools:context=".Activity.ModifyTaskActivity">
         <EditText
             android:id="@+id/nameView"
             android:layout_width="305dp"

build.gradle.kts

@@ -1,4 +1,4 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.0.2" apply false
+    id("com.android.application") version "8.2.0" apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed May 01 19:23:15 EET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists