From 3b44b9b440923e61b197651763cc9c6f29c76c47 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Thu, 4 Jul 2024 08:19:04 -0300
Subject: [PATCH 01/23] Terminei as duas aulas: 12 e 13

---
 .idea/misc.xml                                 |  1 -
 ...eet.kt => CreateOrUpdateTaskBottomSheet.kt} | 14 ++++++++++++--
 .../com/devspace/taskbeats/MainActivity.kt     | 18 +++++++++++-------
 ... => create_or_update_task_bottom_sheet.xml} |  4 ++--
 app/src/main/res/layout/item_task.xml          |  1 -
 app/src/main/res/values/strings.xml            |  6 +++++-
 6 files changed, 30 insertions(+), 14 deletions(-)
 rename app/src/main/java/com/devspace/taskbeats/{CreateTaskBottomSheet.kt => CreateOrUpdateTaskBottomSheet.kt} (81%)
 rename app/src/main/res/layout/{create_task.xml => create_or_update_task_bottom_sheet.xml} (95%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a6e1098..ce095e3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
diff --git a/app/src/main/java/com/devspace/taskbeats/CreateTaskBottomSheet.kt b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
similarity index 81%
rename from app/src/main/java/com/devspace/taskbeats/CreateTaskBottomSheet.kt
rename to app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
index 0224dc4..9bec495 100644
--- a/app/src/main/java/com/devspace/taskbeats/CreateTaskBottomSheet.kt
+++ b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
@@ -11,9 +11,11 @@ import android.widget.Spinner
 import android.widget.TextView
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
+import org.w3c.dom.Text
 
-class CreateTaskBottomSheet(
+class CreateOrUpdateTaskBottomSheet(
     private val categoryList: List<CategoryUiData>,
+    private val task: TaskUiData? = null,
     private val onCreateClicked: (TaskUiData) -> Unit
 ) : BottomSheetDialogFragment() {
     override fun onCreateView(
@@ -21,8 +23,16 @@ class CreateTaskBottomSheet(
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        val view = inflater.inflate(R.layout.create_task, container, false)
+        val view = inflater.inflate(R.layout.create_or_update_task_bottom_sheet, container, false)
         val btnCreate = view.findViewById<Button>(R.id.btn_task_create)
+        val tvTitle = view.findViewById<TextView>(R.id.tv_title)
+        if (task == null) {
+            tvTitle.setText(R.string.create_task_title)
+            btnCreate.setText(R.string.create)
+        } else {
+            tvTitle.setText(R.string.update_task_title)
+            btnCreate.setText(R.string.update)
+        }
         val tieTaskName = view.findViewById<TextView>(R.id.tie_task_name)
         val catSpin = view.findViewById<Spinner>(R.id.category_list)
         var taskCategory: String? = null
diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index f23a227..7df2cda 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -1,5 +1,5 @@
 package com.devspace.taskbeats
-//Onde parei? Terminei aula 11 e parei nos 13:30 da aula 12 - que é click na lista de tarefas. ele vai debugar o código agora.
+//Onde parei? Terminei aula 13 e devo iniciar a aula 14
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
@@ -12,7 +12,7 @@ import kotlinx.coroutines.launch
 class MainActivity : AppCompatActivity() {
     private var categoriess = listOf<CategoryUiData>()
     private var taskss = listOf<TaskUiData>()
-    private val taskAdapter by lazy{
+    private val taskAdapter by lazy {
         TaskListAdapter()
     }
     private val categoryAdapter = CategoryListAdapter()
@@ -46,6 +46,10 @@ class MainActivity : AppCompatActivity() {
             showCreateUpdateTaskBottomSheet()
         }
 
+        taskAdapter.setOnClickListener { task ->
+            showCreateUpdateTaskBottomSheet(task)
+        }
+
         categoryAdapter.setOnClickListener { selected ->
             if (selected.name == "+") {
                 val createCategoryBottomSheet = CreateCategoryBottomSheet { categoryName ->
@@ -85,9 +89,7 @@ class MainActivity : AppCompatActivity() {
             getCategoriesFromDataBase()
         }
         rvTask.adapter = taskAdapter
-        taskAdapter.setOnClickListener {
-            showCreateUpdateTaskBottomSheet()
-        }
+
 
         //categoryAdapter.submitList(categories)
         GlobalScope.launch(Dispatchers.IO) {
@@ -173,8 +175,10 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun showCreateUpdateTaskBottomSheet() {
-        val createTaskBottomSheet = CreateTaskBottomSheet(categoriess)
+    private fun showCreateUpdateTaskBottomSheet(taskUiData: TaskUiData? = null) {
+        val createTaskBottomSheet = CreateOrUpdateTaskBottomSheet(
+            task = taskUiData,
+            categoryList = categoriess)
         { taskToBeCreated ->
             val taskEntityToBeInsert = TaskEntity(
                 id = taskToBeCreated.id, //cuidado com essa porra
diff --git a/app/src/main/res/layout/create_task.xml b/app/src/main/res/layout/create_or_update_task_bottom_sheet.xml
similarity index 95%
rename from app/src/main/res/layout/create_task.xml
rename to app/src/main/res/layout/create_or_update_task_bottom_sheet.xml
index 72d5ee4..1021c79 100644
--- a/app/src/main/res/layout/create_task.xml
+++ b/app/src/main/res/layout/create_or_update_task_bottom_sheet.xml
@@ -11,7 +11,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
-        android:text="Create Task"
+        android:text="@string/create_task_title"
         android:textSize="24sp"
         android:textStyle="bold" />
 
@@ -46,7 +46,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
-        android:text="Create" />
+        android:text="@string/create" />
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_task.xml b/app/src/main/res/layout/item_task.xml
index 5f0dd17..c592b7a 100644
--- a/app/src/main/res/layout/item_task.xml
+++ b/app/src/main/res/layout/item_task.xml
@@ -9,7 +9,6 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:clickable="true"
         android:focusable="true"
         android:foreground="?android:selectableItemBackground"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fc32751..437b010 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,8 @@
 <resources>
-    <string name="app_name">TaskBeats</string>
+    <string name="app_name">TaskBeat</string>
     <string name="home_title">Task Beat</string>
+    <string name="create_task_title">Create task</string>
+    <string name="create">Create</string>
+    <string name="update_task_title">Update task</string>
+    <string name="update">Update</string>
 </resources>
\ No newline at end of file

From 2955bddd42c2ba42b26325229b3c5a24152c4c52 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Fri, 5 Jul 2024 04:57:44 -0300
Subject: [PATCH 02/23] Terminei as duas aulas: 12 e 13

---
 .../CreateOrUpdateTaskBottomSheet.kt          | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
index 9bec495..cb40e17 100644
--- a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
+++ b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
@@ -11,6 +11,7 @@ import android.widget.Spinner
 import android.widget.TextView
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.textfield.TextInputEditText
 import org.w3c.dom.Text
 
 class CreateOrUpdateTaskBottomSheet(
@@ -26,14 +27,7 @@ class CreateOrUpdateTaskBottomSheet(
         val view = inflater.inflate(R.layout.create_or_update_task_bottom_sheet, container, false)
         val btnCreate = view.findViewById<Button>(R.id.btn_task_create)
         val tvTitle = view.findViewById<TextView>(R.id.tv_title)
-        if (task == null) {
-            tvTitle.setText(R.string.create_task_title)
-            btnCreate.setText(R.string.create)
-        } else {
-            tvTitle.setText(R.string.update_task_title)
-            btnCreate.setText(R.string.update)
-        }
-        val tieTaskName = view.findViewById<TextView>(R.id.tie_task_name)
+        val tieTaskName = view.findViewById<TextInputEditText>(R.id.tie_task_name)
         val catSpin = view.findViewById<Spinner>(R.id.category_list)
         var taskCategory: String? = null
         val categoryStr: List<String> = categoryList.map { it.name }
@@ -73,6 +67,22 @@ class CreateOrUpdateTaskBottomSheet(
                 Snackbar.make(btnCreate, "Please select a category", Snackbar.LENGTH_LONG).show()
             }
         }
+        if (task == null) {
+            tvTitle.setText(R.string.create_task_title)
+            btnCreate.setText(R.string.create)
+        } else {
+            tvTitle.setText(R.string.update_task_title)
+            btnCreate.setText(R.string.update)
+            tieTaskName.setText(task.name)
+
+            val currentCategory = categoryList.first{it.name == task.category}
+            catSpin.setSelection(categoryList.indexOf(currentCategory))
+
+
+
+        }
+
+
         return view
     }
 }
\ No newline at end of file

From 4dcbfbd9ccc233582122abfe7eef69a25499386b Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Fri, 5 Jul 2024 05:02:44 -0300
Subject: [PATCH 03/23] Terminei as duas aulas: 12 e 13

---
 .../com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
index cb40e17..86f2f6a 100644
--- a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
+++ b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
@@ -82,7 +82,7 @@ class CreateOrUpdateTaskBottomSheet(
 
         }
 
-
+//
         return view
     }
 }
\ No newline at end of file

From cc6fb818a48a263bb5eb9b8653cd02f1190f7759 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Fri, 5 Jul 2024 06:07:52 -0300
Subject: [PATCH 04/23] Terminei a aula: 15

---
 .../CreateOrUpdateTaskBottomSheet.kt          | 36 +++++++++++--------
 .../com/devspace/taskbeats/MainActivity.kt    | 33 ++++++++++++-----
 .../java/com/devspace/taskbeats/TaskDao.kt    |  5 +++
 .../java/com/devspace/taskbeats/TaskEntity.kt |  2 +-
 4 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
index 86f2f6a..641a958 100644
--- a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
+++ b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
@@ -12,12 +12,12 @@ import android.widget.TextView
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textfield.TextInputEditText
-import org.w3c.dom.Text
 
 class CreateOrUpdateTaskBottomSheet(
     private val categoryList: List<CategoryUiData>,
     private val task: TaskUiData? = null,
-    private val onCreateClicked: (TaskUiData) -> Unit
+    private val onCreateClicked: (TaskUiData) -> Unit,
+    private val onUpdateClicked: (TaskUiData) -> Unit
 ) : BottomSheetDialogFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -56,13 +56,26 @@ class CreateOrUpdateTaskBottomSheet(
         btnCreate.setOnClickListener {
             if (taskCategory != null) {
                 val name = tieTaskName.text.toString()
-                onCreateClicked.invoke(
-                    TaskUiData(
-                        id = 11,
-                        name = name,
-                        category = requireNotNull(taskCategory)
+
+                if (task == null) {
+                    onCreateClicked.invoke(
+                        TaskUiData(
+                            id = 11,
+                            name = name,
+                            category = requireNotNull(taskCategory)
+                        )
+                    )
+                } else {
+                    onUpdateClicked.invoke(
+                        TaskUiData(
+                            id = task.id,
+                            name = name,
+                            category = requireNotNull(taskCategory)
+                        )
                     )
-                )
+                }
+
+
             } else {
                 Snackbar.make(btnCreate, "Please select a category", Snackbar.LENGTH_LONG).show()
             }
@@ -75,14 +88,9 @@ class CreateOrUpdateTaskBottomSheet(
             btnCreate.setText(R.string.update)
             tieTaskName.setText(task.name)
 
-            val currentCategory = categoryList.first{it.name == task.category}
+            val currentCategory = categoryList.first { it.name == task.category }
             catSpin.setSelection(categoryList.indexOf(currentCategory))
-
-
-
         }
-
-//
         return view
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index 7df2cda..c3a0670 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -175,18 +175,33 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun updateTask(taskEntity: TaskEntity){
+        GlobalScope.launch(Dispatchers.IO){
+            taskDao.update(taskEntity)
+            getTasksFromDataBase()
+        }
+    }
+
     private fun showCreateUpdateTaskBottomSheet(taskUiData: TaskUiData? = null) {
         val createTaskBottomSheet = CreateOrUpdateTaskBottomSheet(
             task = taskUiData,
-            categoryList = categoriess)
-        { taskToBeCreated ->
-            val taskEntityToBeInsert = TaskEntity(
-                id = taskToBeCreated.id, //cuidado com essa porra
-                name = taskToBeCreated.name,
-                category = taskToBeCreated.category
-            )
-            insertTask(taskEntityToBeInsert)
-        }
+            categoryList = categoriess,
+            onCreateClicked = { taskToBeCreated ->
+                val taskEntityToBeInsert = TaskEntity(
+                    name = taskToBeCreated.name,
+                    category = taskToBeCreated.category
+                )
+                insertTask(taskEntityToBeInsert)
+            },
+            onUpdateClicked = { taskToBeUpdated ->
+                val taskEntityToBeUpdate = TaskEntity(
+                    id = taskToBeUpdated.id, //cuidado com essa porra
+                    name = taskToBeUpdated.name,
+                    category = taskToBeUpdated.category)
+
+                updateTask(taskEntityToBeUpdate)
+            }
+        )
         createTaskBottomSheet.show(supportFragmentManager, "createTaskBottomSheet")
     }
 }
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskDao.kt b/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
index 45fb4b8..c9d01ac 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
@@ -4,6 +4,7 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.Update
 
 @Dao
 interface TaskDao {
@@ -15,4 +16,8 @@ interface TaskDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insert(taskEntity: TaskEntity)
+
+    @Update
+    fun update(taskEntity: TaskEntity)
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt b/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
index 8148809..e909b03 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
@@ -8,7 +8,7 @@ import androidx.room.PrimaryKey
 @Entity
 data class TaskEntity(
     @PrimaryKey(autoGenerate = true)
-    val id: Long,
+    val id: Long = 11,
     @ColumnInfo
     val name: String,
     @ColumnInfo

From aa0339248fa54f48f7a47f9dcc3ef2558d6dda4d Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Fri, 5 Jul 2024 06:16:03 -0300
Subject: [PATCH 05/23] Terminei a aula: 15

---
 app/src/main/java/com/devspace/taskbeats/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index c3a0670..96de9e5 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -205,7 +205,7 @@ class MainActivity : AppCompatActivity() {
         createTaskBottomSheet.show(supportFragmentManager, "createTaskBottomSheet")
     }
 }
-
+//
 val categories: List<CategoryUiData> = listOf(
     //Lista vazia pra testar se o dado foi pro DB mesmo.
     CategoryUiData(

From 5b4af7c2591cfd351265c847e3b1d0b24b284f26 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Mon, 8 Jul 2024 23:34:31 -0300
Subject: [PATCH 06/23] Terminei a aula: 15

---
 app/src/main/java/com/devspace/taskbeats/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index 96de9e5..47ca453 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -205,7 +205,7 @@ class MainActivity : AppCompatActivity() {
         createTaskBottomSheet.show(supportFragmentManager, "createTaskBottomSheet")
     }
 }
-//
+////
 val categories: List<CategoryUiData> = listOf(
     //Lista vazia pra testar se o dado foi pro DB mesmo.
     CategoryUiData(

From 0b9a037e4c35ac41c7e8cd810f70e4c4d759ac49 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Mon, 8 Jul 2024 23:36:57 -0300
Subject: [PATCH 07/23] Terminei a aula: 15

---
 app/src/main/java/com/devspace/taskbeats/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index 47ca453..caea6a6 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -205,7 +205,7 @@ class MainActivity : AppCompatActivity() {
         createTaskBottomSheet.show(supportFragmentManager, "createTaskBottomSheet")
     }
 }
-////
+////Estou Enviando o código
 val categories: List<CategoryUiData> = listOf(
     //Lista vazia pra testar se o dado foi pro DB mesmo.
     CategoryUiData(

From 80da605dfb1cfea020c47f7acb1860995566c5bc Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Mon, 8 Jul 2024 23:38:43 -0300
Subject: [PATCH 08/23] Terminei a aula: 15

---
 app/src/main/java/com/devspace/taskbeats/MainActivity.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index caea6a6..70b25e5 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -1,5 +1,5 @@
 package com.devspace.taskbeats
-//Onde parei? Terminei aula 13 e devo iniciar a aula 14
+//Onde parei? Terminei aula 15, devo iniciar a 16
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
@@ -205,7 +205,7 @@ class MainActivity : AppCompatActivity() {
         createTaskBottomSheet.show(supportFragmentManager, "createTaskBottomSheet")
     }
 }
-////Estou Enviando o código
+//
 val categories: List<CategoryUiData> = listOf(
     //Lista vazia pra testar se o dado foi pro DB mesmo.
     CategoryUiData(

From 18b8b3aad0cc4f21eded9777f9832dd8c441d8d4 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Thu, 4 Jul 2024 08:19:04 -0300
Subject: [PATCH 09/23] Terminei as duas aulas: 12 e 13

---
 .idea/misc.xml                                 |  1 -
 ...eet.kt => CreateOrUpdateTaskBottomSheet.kt} | 14 ++++++++++++--
 .../com/devspace/taskbeats/MainActivity.kt     | 18 +++++++++++-------
 ... => create_or_update_task_bottom_sheet.xml} |  4 ++--
 app/src/main/res/layout/item_task.xml          |  1 -
 app/src/main/res/values/strings.xml            |  6 +++++-
 6 files changed, 30 insertions(+), 14 deletions(-)
 rename app/src/main/java/com/devspace/taskbeats/{CreateTaskBottomSheet.kt => CreateOrUpdateTaskBottomSheet.kt} (81%)
 rename app/src/main/res/layout/{create_task.xml => create_or_update_task_bottom_sheet.xml} (95%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a6e1098..ce095e3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
diff --git a/app/src/main/java/com/devspace/taskbeats/CreateTaskBottomSheet.kt b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
similarity index 81%
rename from app/src/main/java/com/devspace/taskbeats/CreateTaskBottomSheet.kt
rename to app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
index 0224dc4..9bec495 100644
--- a/app/src/main/java/com/devspace/taskbeats/CreateTaskBottomSheet.kt
+++ b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
@@ -11,9 +11,11 @@ import android.widget.Spinner
 import android.widget.TextView
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
+import org.w3c.dom.Text
 
-class CreateTaskBottomSheet(
+class CreateOrUpdateTaskBottomSheet(
     private val categoryList: List<CategoryUiData>,
+    private val task: TaskUiData? = null,
     private val onCreateClicked: (TaskUiData) -> Unit
 ) : BottomSheetDialogFragment() {
     override fun onCreateView(
@@ -21,8 +23,16 @@ class CreateTaskBottomSheet(
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        val view = inflater.inflate(R.layout.create_task, container, false)
+        val view = inflater.inflate(R.layout.create_or_update_task_bottom_sheet, container, false)
         val btnCreate = view.findViewById<Button>(R.id.btn_task_create)
+        val tvTitle = view.findViewById<TextView>(R.id.tv_title)
+        if (task == null) {
+            tvTitle.setText(R.string.create_task_title)
+            btnCreate.setText(R.string.create)
+        } else {
+            tvTitle.setText(R.string.update_task_title)
+            btnCreate.setText(R.string.update)
+        }
         val tieTaskName = view.findViewById<TextView>(R.id.tie_task_name)
         val catSpin = view.findViewById<Spinner>(R.id.category_list)
         var taskCategory: String? = null
diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index f23a227..7df2cda 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -1,5 +1,5 @@
 package com.devspace.taskbeats
-//Onde parei? Terminei aula 11 e parei nos 13:30 da aula 12 - que é click na lista de tarefas. ele vai debugar o código agora.
+//Onde parei? Terminei aula 13 e devo iniciar a aula 14
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
@@ -12,7 +12,7 @@ import kotlinx.coroutines.launch
 class MainActivity : AppCompatActivity() {
     private var categoriess = listOf<CategoryUiData>()
     private var taskss = listOf<TaskUiData>()
-    private val taskAdapter by lazy{
+    private val taskAdapter by lazy {
         TaskListAdapter()
     }
     private val categoryAdapter = CategoryListAdapter()
@@ -46,6 +46,10 @@ class MainActivity : AppCompatActivity() {
             showCreateUpdateTaskBottomSheet()
         }
 
+        taskAdapter.setOnClickListener { task ->
+            showCreateUpdateTaskBottomSheet(task)
+        }
+
         categoryAdapter.setOnClickListener { selected ->
             if (selected.name == "+") {
                 val createCategoryBottomSheet = CreateCategoryBottomSheet { categoryName ->
@@ -85,9 +89,7 @@ class MainActivity : AppCompatActivity() {
             getCategoriesFromDataBase()
         }
         rvTask.adapter = taskAdapter
-        taskAdapter.setOnClickListener {
-            showCreateUpdateTaskBottomSheet()
-        }
+
 
         //categoryAdapter.submitList(categories)
         GlobalScope.launch(Dispatchers.IO) {
@@ -173,8 +175,10 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun showCreateUpdateTaskBottomSheet() {
-        val createTaskBottomSheet = CreateTaskBottomSheet(categoriess)
+    private fun showCreateUpdateTaskBottomSheet(taskUiData: TaskUiData? = null) {
+        val createTaskBottomSheet = CreateOrUpdateTaskBottomSheet(
+            task = taskUiData,
+            categoryList = categoriess)
         { taskToBeCreated ->
             val taskEntityToBeInsert = TaskEntity(
                 id = taskToBeCreated.id, //cuidado com essa porra
diff --git a/app/src/main/res/layout/create_task.xml b/app/src/main/res/layout/create_or_update_task_bottom_sheet.xml
similarity index 95%
rename from app/src/main/res/layout/create_task.xml
rename to app/src/main/res/layout/create_or_update_task_bottom_sheet.xml
index 72d5ee4..1021c79 100644
--- a/app/src/main/res/layout/create_task.xml
+++ b/app/src/main/res/layout/create_or_update_task_bottom_sheet.xml
@@ -11,7 +11,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
-        android:text="Create Task"
+        android:text="@string/create_task_title"
         android:textSize="24sp"
         android:textStyle="bold" />
 
@@ -46,7 +46,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
-        android:text="Create" />
+        android:text="@string/create" />
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_task.xml b/app/src/main/res/layout/item_task.xml
index 5f0dd17..c592b7a 100644
--- a/app/src/main/res/layout/item_task.xml
+++ b/app/src/main/res/layout/item_task.xml
@@ -9,7 +9,6 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:clickable="true"
         android:focusable="true"
         android:foreground="?android:selectableItemBackground"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fc32751..437b010 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,8 @@
 <resources>
-    <string name="app_name">TaskBeats</string>
+    <string name="app_name">TaskBeat</string>
     <string name="home_title">Task Beat</string>
+    <string name="create_task_title">Create task</string>
+    <string name="create">Create</string>
+    <string name="update_task_title">Update task</string>
+    <string name="update">Update</string>
 </resources>
\ No newline at end of file

From 87708af7deab5c2cdeaa986f7ab7e44e3846c921 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Fri, 5 Jul 2024 04:57:44 -0300
Subject: [PATCH 10/23] Terminei as duas aulas: 12 e 13

---
 .../CreateOrUpdateTaskBottomSheet.kt          | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
index 9bec495..cb40e17 100644
--- a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
+++ b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
@@ -11,6 +11,7 @@ import android.widget.Spinner
 import android.widget.TextView
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.textfield.TextInputEditText
 import org.w3c.dom.Text
 
 class CreateOrUpdateTaskBottomSheet(
@@ -26,14 +27,7 @@ class CreateOrUpdateTaskBottomSheet(
         val view = inflater.inflate(R.layout.create_or_update_task_bottom_sheet, container, false)
         val btnCreate = view.findViewById<Button>(R.id.btn_task_create)
         val tvTitle = view.findViewById<TextView>(R.id.tv_title)
-        if (task == null) {
-            tvTitle.setText(R.string.create_task_title)
-            btnCreate.setText(R.string.create)
-        } else {
-            tvTitle.setText(R.string.update_task_title)
-            btnCreate.setText(R.string.update)
-        }
-        val tieTaskName = view.findViewById<TextView>(R.id.tie_task_name)
+        val tieTaskName = view.findViewById<TextInputEditText>(R.id.tie_task_name)
         val catSpin = view.findViewById<Spinner>(R.id.category_list)
         var taskCategory: String? = null
         val categoryStr: List<String> = categoryList.map { it.name }
@@ -73,6 +67,22 @@ class CreateOrUpdateTaskBottomSheet(
                 Snackbar.make(btnCreate, "Please select a category", Snackbar.LENGTH_LONG).show()
             }
         }
+        if (task == null) {
+            tvTitle.setText(R.string.create_task_title)
+            btnCreate.setText(R.string.create)
+        } else {
+            tvTitle.setText(R.string.update_task_title)
+            btnCreate.setText(R.string.update)
+            tieTaskName.setText(task.name)
+
+            val currentCategory = categoryList.first{it.name == task.category}
+            catSpin.setSelection(categoryList.indexOf(currentCategory))
+
+
+
+        }
+
+
         return view
     }
 }
\ No newline at end of file

From 09cda52a080c64265350af27c03925f83b15a4fc Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Fri, 5 Jul 2024 05:02:44 -0300
Subject: [PATCH 11/23] Terminei as duas aulas: 12 e 13

---
 .../com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
index cb40e17..86f2f6a 100644
--- a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
+++ b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
@@ -82,7 +82,7 @@ class CreateOrUpdateTaskBottomSheet(
 
         }
 
-
+//
         return view
     }
 }
\ No newline at end of file

From 0b1748450a2bbd61d07d6dd8d88fee855f6c2038 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Fri, 5 Jul 2024 06:07:52 -0300
Subject: [PATCH 12/23] Terminei a aula: 15

---
 .../CreateOrUpdateTaskBottomSheet.kt          | 36 +++++++++++--------
 .../com/devspace/taskbeats/MainActivity.kt    | 33 ++++++++++++-----
 .../java/com/devspace/taskbeats/TaskDao.kt    |  5 +++
 .../java/com/devspace/taskbeats/TaskEntity.kt |  2 +-
 4 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
index 86f2f6a..641a958 100644
--- a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
+++ b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
@@ -12,12 +12,12 @@ import android.widget.TextView
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textfield.TextInputEditText
-import org.w3c.dom.Text
 
 class CreateOrUpdateTaskBottomSheet(
     private val categoryList: List<CategoryUiData>,
     private val task: TaskUiData? = null,
-    private val onCreateClicked: (TaskUiData) -> Unit
+    private val onCreateClicked: (TaskUiData) -> Unit,
+    private val onUpdateClicked: (TaskUiData) -> Unit
 ) : BottomSheetDialogFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -56,13 +56,26 @@ class CreateOrUpdateTaskBottomSheet(
         btnCreate.setOnClickListener {
             if (taskCategory != null) {
                 val name = tieTaskName.text.toString()
-                onCreateClicked.invoke(
-                    TaskUiData(
-                        id = 11,
-                        name = name,
-                        category = requireNotNull(taskCategory)
+
+                if (task == null) {
+                    onCreateClicked.invoke(
+                        TaskUiData(
+                            id = 11,
+                            name = name,
+                            category = requireNotNull(taskCategory)
+                        )
+                    )
+                } else {
+                    onUpdateClicked.invoke(
+                        TaskUiData(
+                            id = task.id,
+                            name = name,
+                            category = requireNotNull(taskCategory)
+                        )
                     )
-                )
+                }
+
+
             } else {
                 Snackbar.make(btnCreate, "Please select a category", Snackbar.LENGTH_LONG).show()
             }
@@ -75,14 +88,9 @@ class CreateOrUpdateTaskBottomSheet(
             btnCreate.setText(R.string.update)
             tieTaskName.setText(task.name)
 
-            val currentCategory = categoryList.first{it.name == task.category}
+            val currentCategory = categoryList.first { it.name == task.category }
             catSpin.setSelection(categoryList.indexOf(currentCategory))
-
-
-
         }
-
-//
         return view
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index 7df2cda..c3a0670 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -175,18 +175,33 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun updateTask(taskEntity: TaskEntity){
+        GlobalScope.launch(Dispatchers.IO){
+            taskDao.update(taskEntity)
+            getTasksFromDataBase()
+        }
+    }
+
     private fun showCreateUpdateTaskBottomSheet(taskUiData: TaskUiData? = null) {
         val createTaskBottomSheet = CreateOrUpdateTaskBottomSheet(
             task = taskUiData,
-            categoryList = categoriess)
-        { taskToBeCreated ->
-            val taskEntityToBeInsert = TaskEntity(
-                id = taskToBeCreated.id, //cuidado com essa porra
-                name = taskToBeCreated.name,
-                category = taskToBeCreated.category
-            )
-            insertTask(taskEntityToBeInsert)
-        }
+            categoryList = categoriess,
+            onCreateClicked = { taskToBeCreated ->
+                val taskEntityToBeInsert = TaskEntity(
+                    name = taskToBeCreated.name,
+                    category = taskToBeCreated.category
+                )
+                insertTask(taskEntityToBeInsert)
+            },
+            onUpdateClicked = { taskToBeUpdated ->
+                val taskEntityToBeUpdate = TaskEntity(
+                    id = taskToBeUpdated.id, //cuidado com essa porra
+                    name = taskToBeUpdated.name,
+                    category = taskToBeUpdated.category)
+
+                updateTask(taskEntityToBeUpdate)
+            }
+        )
         createTaskBottomSheet.show(supportFragmentManager, "createTaskBottomSheet")
     }
 }
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskDao.kt b/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
index 45fb4b8..c9d01ac 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
@@ -4,6 +4,7 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.Update
 
 @Dao
 interface TaskDao {
@@ -15,4 +16,8 @@ interface TaskDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insert(taskEntity: TaskEntity)
+
+    @Update
+    fun update(taskEntity: TaskEntity)
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt b/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
index 8148809..e909b03 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
@@ -8,7 +8,7 @@ import androidx.room.PrimaryKey
 @Entity
 data class TaskEntity(
     @PrimaryKey(autoGenerate = true)
-    val id: Long,
+    val id: Long = 11,
     @ColumnInfo
     val name: String,
     @ColumnInfo

From 09c48b5f4f55612a9beb9900e2b1f1affb4795c6 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Fri, 5 Jul 2024 06:16:03 -0300
Subject: [PATCH 13/23] Terminei a aula: 15

---
 app/src/main/java/com/devspace/taskbeats/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index c3a0670..96de9e5 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -205,7 +205,7 @@ class MainActivity : AppCompatActivity() {
         createTaskBottomSheet.show(supportFragmentManager, "createTaskBottomSheet")
     }
 }
-
+//
 val categories: List<CategoryUiData> = listOf(
     //Lista vazia pra testar se o dado foi pro DB mesmo.
     CategoryUiData(

From b2113bbf52705229d4426261a07b46d762d848e0 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Mon, 8 Jul 2024 23:34:31 -0300
Subject: [PATCH 14/23] Terminei a aula: 15

---
 app/src/main/java/com/devspace/taskbeats/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index 96de9e5..47ca453 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -205,7 +205,7 @@ class MainActivity : AppCompatActivity() {
         createTaskBottomSheet.show(supportFragmentManager, "createTaskBottomSheet")
     }
 }
-//
+////
 val categories: List<CategoryUiData> = listOf(
     //Lista vazia pra testar se o dado foi pro DB mesmo.
     CategoryUiData(

From 1e545e925f76f7e372830cd77fd5134139747357 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Mon, 8 Jul 2024 23:36:57 -0300
Subject: [PATCH 15/23] Terminei a aula: 15

---
 app/src/main/java/com/devspace/taskbeats/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index 47ca453..caea6a6 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -205,7 +205,7 @@ class MainActivity : AppCompatActivity() {
         createTaskBottomSheet.show(supportFragmentManager, "createTaskBottomSheet")
     }
 }
-////
+////Estou Enviando o código
 val categories: List<CategoryUiData> = listOf(
     //Lista vazia pra testar se o dado foi pro DB mesmo.
     CategoryUiData(

From 77a6f7fbc796de7e3272388a214cbd2efda07d7b Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Mon, 8 Jul 2024 23:38:43 -0300
Subject: [PATCH 16/23] Terminei a aula: 15

---
 app/src/main/java/com/devspace/taskbeats/MainActivity.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index caea6a6..70b25e5 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -1,5 +1,5 @@
 package com.devspace.taskbeats
-//Onde parei? Terminei aula 13 e devo iniciar a aula 14
+//Onde parei? Terminei aula 15, devo iniciar a 16
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
@@ -205,7 +205,7 @@ class MainActivity : AppCompatActivity() {
         createTaskBottomSheet.show(supportFragmentManager, "createTaskBottomSheet")
     }
 }
-////Estou Enviando o código
+//
 val categories: List<CategoryUiData> = listOf(
     //Lista vazia pra testar se o dado foi pro DB mesmo.
     CategoryUiData(

From 084cfd9ca1430fd412f1cb26bf9677a42de7135f Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Tue, 9 Jul 2024 01:22:09 -0300
Subject: [PATCH 17/23] =?UTF-8?q?Terminei=20a=20aula:=2016=20com=20uma=20o?=
 =?UTF-8?q?bserva=C3=A7=C3=A3o:=20Eu=20coloquei=20o=20index,=20para=20gara?=
 =?UTF-8?q?ntir=20que=20os=20dados=20sejam=20inseridos=20uma=20s=C3=B3=20v?=
 =?UTF-8?q?ez,=20pois=20o=20dismiss=20estava=20chamando=20o=20oncreate=20d?=
 =?UTF-8?q?e=20novo=20e=20de=20novo,=20e=20isso=20tava=20fazendo=20inserir?=
 =?UTF-8?q?=20as=20tarefas=20padr=C3=A3o=20v=C3=A1rias=20vezes.=20Ao=20usa?=
 =?UTF-8?q?r=20o=20index,=20isso=20garantiu=20que=20s=C3=B3=20acontecesse?=
 =?UTF-8?q?=20uma=20vez.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateOrUpdateTaskBottomSheet.kt          | 38 ++++++++---
 .../com/devspace/taskbeats/MainActivity.kt    | 67 ++++++++++++-------
 .../java/com/devspace/taskbeats/TaskDao.kt    |  5 +-
 .../java/com/devspace/taskbeats/TaskEntity.kt | 10 ++-
 .../create_or_update_task_bottom_sheet.xml    | 31 +++++++--
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 107 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
index 641a958..6949c9a 100644
--- a/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
+++ b/app/src/main/java/com/devspace/taskbeats/CreateOrUpdateTaskBottomSheet.kt
@@ -1,6 +1,7 @@
 package com.devspace.taskbeats
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -9,6 +10,7 @@ import android.widget.ArrayAdapter
 import android.widget.Button
 import android.widget.Spinner
 import android.widget.TextView
+import androidx.core.view.isVisible
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textfield.TextInputEditText
@@ -17,7 +19,8 @@ class CreateOrUpdateTaskBottomSheet(
     private val categoryList: List<CategoryUiData>,
     private val task: TaskUiData? = null,
     private val onCreateClicked: (TaskUiData) -> Unit,
-    private val onUpdateClicked: (TaskUiData) -> Unit
+    private val onUpdateClicked: (TaskUiData) -> Unit,
+    private val onDeleteClicked: (TaskUiData) -> Unit
 ) : BottomSheetDialogFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -25,7 +28,8 @@ class CreateOrUpdateTaskBottomSheet(
         savedInstanceState: Bundle?
     ): View? {
         val view = inflater.inflate(R.layout.create_or_update_task_bottom_sheet, container, false)
-        val btnCreate = view.findViewById<Button>(R.id.btn_task_create)
+        val btnCreateOrUpdate = view.findViewById<Button>(R.id.btn_task_create_or_update)
+        val btnDelete = view.findViewById<Button>(R.id.btn_task_delete)
         val tvTitle = view.findViewById<TextView>(R.id.tv_title)
         val tieTaskName = view.findViewById<TextInputEditText>(R.id.tie_task_name)
         val catSpin = view.findViewById<Spinner>(R.id.category_list)
@@ -53,18 +57,21 @@ class CreateOrUpdateTaskBottomSheet(
 
             }
         }
-        btnCreate.setOnClickListener {
-            if (taskCategory != null) {
-                val name = tieTaskName.text.toString()
 
+
+
+        btnCreateOrUpdate.setOnClickListener {
+            val name = tieTaskName.text.toString().trim()
+            if (taskCategory != null && name.isNotEmpty()) {
                 if (task == null) {
                     onCreateClicked.invoke(
                         TaskUiData(
-                            id = 11,
+                            id = 0,
                             name = name,
                             category = requireNotNull(taskCategory)
                         )
                     )
+                    dismiss()
                 } else {
                     onUpdateClicked.invoke(
                         TaskUiData(
@@ -73,21 +80,32 @@ class CreateOrUpdateTaskBottomSheet(
                             category = requireNotNull(taskCategory)
                         )
                     )
+                    dismiss()
                 }
 
 
             } else {
-                Snackbar.make(btnCreate, "Please select a category", Snackbar.LENGTH_LONG).show()
+                Snackbar.make(btnCreateOrUpdate, "Please select a category", Snackbar.LENGTH_LONG)
+                    .show()
             }
         }
         if (task == null) {
+            btnDelete.isVisible = false
             tvTitle.setText(R.string.create_task_title)
-            btnCreate.setText(R.string.create)
+            btnCreateOrUpdate.setText(R.string.create)
         } else {
             tvTitle.setText(R.string.update_task_title)
-            btnCreate.setText(R.string.update)
+            btnCreateOrUpdate.setText(R.string.update)
             tieTaskName.setText(task.name)
-
+            btnDelete.isVisible = true
+            btnDelete.setOnClickListener {
+                if (task != null) {
+                    onDeleteClicked.invoke(task)
+                    dismiss()
+                } else {
+                    Log.d("CreateOrUpdateTaskBottomSheet", "Task not found")
+                }
+            }
             val currentCategory = categoryList.first { it.name == task.category }
             catSpin.setSelection(categoryList.indexOf(currentCategory))
         }
diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index 70b25e5..89c7e3e 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -1,5 +1,5 @@
 package com.devspace.taskbeats
-//Onde parei? Terminei aula 15, devo iniciar a 16
+//Onde parei? Terminei aula 16, devo iniciar a 17
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
@@ -175,13 +175,20 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun updateTask(taskEntity: TaskEntity){
-        GlobalScope.launch(Dispatchers.IO){
+    private fun updateTask(taskEntity: TaskEntity) {
+        GlobalScope.launch(Dispatchers.IO) {
             taskDao.update(taskEntity)
             getTasksFromDataBase()
         }
     }
 
+    private fun deleteTask(taskEntity: TaskEntity) {
+        GlobalScope.launch(Dispatchers.IO) {
+            taskDao.delete(taskEntity)
+            getTasksFromDataBase()
+        }
+    }
+
     private fun showCreateUpdateTaskBottomSheet(taskUiData: TaskUiData? = null) {
         val createTaskBottomSheet = CreateOrUpdateTaskBottomSheet(
             task = taskUiData,
@@ -197,14 +204,24 @@ class MainActivity : AppCompatActivity() {
                 val taskEntityToBeUpdate = TaskEntity(
                     id = taskToBeUpdated.id, //cuidado com essa porra
                     name = taskToBeUpdated.name,
-                    category = taskToBeUpdated.category)
+                    category = taskToBeUpdated.category
+                )
 
                 updateTask(taskEntityToBeUpdate)
+            },
+            onDeleteClicked = { taskToBeDeleted ->
+                val taskEntityToBeDeleted = TaskEntity(
+                    id = taskToBeDeleted.id,
+                    name = taskToBeDeleted.name,
+                    category = taskToBeDeleted.category
+                )
+                deleteTask(taskEntityToBeDeleted)
             }
         )
         createTaskBottomSheet.show(supportFragmentManager, "createTaskBottomSheet")
     }
 }
+
 //
 val categories: List<CategoryUiData> = listOf(
     //Lista vazia pra testar se o dado foi pro DB mesmo.
@@ -258,57 +275,57 @@ val categories: List<CategoryUiData> = listOf(
 val tasks = listOf(
     TaskUiData(
         0,
-        "Ler 10 páginas do livro atual",
+        "01 - Ler 10 páginas do livro atual",
         "STUDY",
     ),
     TaskUiData(
-        1,
-        "45 min de treino na academia",
+        0,
+        "02 - 45 min de treino na academia",
         "HEALTH",
     ),
     TaskUiData(
-        2,
-        "Correr 5km",
+        0,
+        "03 - Correr 5km",
         "HEALTH",
     ),
     TaskUiData(
-        3,
-        "Meditar por 10 min",
+        0,
+        "04 - Meditar por 10 min",
         "WELLNESS",
     ),
     TaskUiData(
-        4,
-        "Silêncio total por 5 min",
+        0,
+        "05 - Silêncio total por 5 min",
         "WELLNESS",
     ),
     TaskUiData(
-        5,
-        "Descer o livo",
+        0,
+        "06 - Descer o livo",
         "HOME",
     ),
     TaskUiData(
-        6,
-        "Tirar caixas da garagem",
+        0,
+        "07 - Tirar caixas da garagem",
         "HOME",
     ),
     TaskUiData(
-        7,
-        "Lavar o carro",
+        0,
+        "08 - Lavar o carro",
         "HOME",
     ),
     TaskUiData(
-        8,
-        "Gravar aulas DevSpace",
+        0,
+        "09 - Gravar aulas DevSpace",
         "WORK",
     ),
     TaskUiData(
-        9,
-        "Criar planejamento de vídeos da semana",
+        0,
+        "10 - Criar planejamento de vídeos da semana",
         "WORK",
     ),
     TaskUiData(
-        10,
-        "Soltar reels da semana",
+        0,
+        "11 - Soltar reels da semana",
         "WORK",
     ),
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskDao.kt b/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
index c9d01ac..0699b3a 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
@@ -1,6 +1,7 @@
 package com.devspace.taskbeats
 
 import androidx.room.Dao
+import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
@@ -8,7 +9,7 @@ import androidx.room.Update
 
 @Dao
 interface TaskDao {
-    @Query("Select * From taskentity")
+    @Query("Select * From taskentity ORDER BY id ASC")
     fun getAll(): List<TaskEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -20,4 +21,6 @@ interface TaskDao {
     @Update
     fun update(taskEntity: TaskEntity)
 
+    @Delete
+    fun delete(taskEntity: TaskEntity)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt b/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
index e909b03..e555fba 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
@@ -3,12 +3,18 @@ package com.devspace.taskbeats
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
+import androidx.room.Index
 import androidx.room.PrimaryKey
 
-@Entity
+@Entity(
+    tableName = "taskentity",
+    indices = [
+        Index(value = ["name", "category"], unique = true)
+    ]
+)
 data class TaskEntity(
     @PrimaryKey(autoGenerate = true)
-    val id: Long = 11,
+    val id: Long = 0,
     @ColumnInfo
     val name: String,
     @ColumnInfo
diff --git a/app/src/main/res/layout/create_or_update_task_bottom_sheet.xml b/app/src/main/res/layout/create_or_update_task_bottom_sheet.xml
index 1021c79..4afb1f9 100644
--- a/app/src/main/res/layout/create_or_update_task_bottom_sheet.xml
+++ b/app/src/main/res/layout/create_or_update_task_bottom_sheet.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:padding="16dp">
 
     <TextView
         android:id="@+id/tv_title"
@@ -39,14 +40,30 @@
             android:minHeight="48dp" />
     </com.google.android.material.textfield.TextInputLayout>
 
-    <Button
-        android:id="@+id/btn_task_create"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="8dp"
-        android:text="@string/create" />
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:padding="16dp"
+        android:weightSum="2">
+
+        <Button
+            android:id="@+id/btn_task_delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_weight="1"
+            android:text="@string/delete" />
+
+        <Button
+            android:id="@+id/btn_task_create_or_update"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_weight="1"
+            android:text="@string/create" />
+    </LinearLayout>
 
 
 </LinearLayout>
\ 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 437b010..9020565 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
     <string name="home_title">Task Beat</string>
     <string name="create_task_title">Create task</string>
     <string name="create">Create</string>
+    <string name="delete">Delete</string>
     <string name="update_task_title">Update task</string>
     <string name="update">Update</string>
 </resources>
\ No newline at end of file

From 568733bf7009ba3cb5afdef6d1eb607eb38af76d Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Tue, 9 Jul 2024 22:24:58 -0300
Subject: [PATCH 18/23] Terminei a aula: 17 - deletando apenas a categoria.

---
 .../java/com/devspace/taskbeats/CategoryDao.kt    |  4 ++++
 .../com/devspace/taskbeats/CategoryListAdapter.kt | 15 +++++++++++++--
 .../java/com/devspace/taskbeats/MainActivity.kt   | 15 ++++++++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/CategoryDao.kt b/app/src/main/java/com/devspace/taskbeats/CategoryDao.kt
index faf1a12..3319d73 100644
--- a/app/src/main/java/com/devspace/taskbeats/CategoryDao.kt
+++ b/app/src/main/java/com/devspace/taskbeats/CategoryDao.kt
@@ -1,6 +1,7 @@
 package com.devspace.taskbeats
 
 import androidx.room.Dao
+import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
@@ -18,4 +19,7 @@ interface CategoryDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun inset(categoryEntity: CategoryEntity)
 
+    @Delete
+    fun delete(categoryEntity: CategoryEntity)
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/CategoryListAdapter.kt b/app/src/main/java/com/devspace/taskbeats/CategoryListAdapter.kt
index 782692a..ee7453c 100644
--- a/app/src/main/java/com/devspace/taskbeats/CategoryListAdapter.kt
+++ b/app/src/main/java/com/devspace/taskbeats/CategoryListAdapter.kt
@@ -12,11 +12,16 @@ class CategoryListAdapter :
     ListAdapter<CategoryUiData, CategoryListAdapter.CategoryViewHolder>(CategoryListAdapter) {
 
     private var onClick: (CategoryUiData) -> Unit = {} //optei por inicializar SEMPRE, por padrão, como uma função VAZIA, pra nao dar crash caso eu nao inicialize
+    private lateinit var onLongClick: (CategoryUiData) -> Unit
 
     fun setOnClickListener(onClick: (CategoryUiData) -> Unit) {
         this.onClick = onClick
     }
 
+    fun setOnLongClickListener(onLongClick: (CategoryUiData) -> Unit){
+        this.onLongClick = onLongClick
+    }
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CategoryViewHolder {
         val view =
             LayoutInflater.from(parent.context).inflate(R.layout.item_category, parent, false)
@@ -25,19 +30,25 @@ class CategoryListAdapter :
 
     override fun onBindViewHolder(holder: CategoryViewHolder, position: Int) {
         val category = getItem(position)
-        holder.bind(category, onClick)
+        holder.bind(category, onClick, onLongClick)
     }
 
     class CategoryViewHolder(private val view: View) : RecyclerView.ViewHolder(view) {
         private val tvCategory = view.findViewById<TextView>(R.id.tv_category)
 
-        fun bind(category: CategoryUiData, onClick: (CategoryUiData) -> Unit) {
+        fun bind(category: CategoryUiData, onClick: (CategoryUiData) -> Unit, onLongClick: (CategoryUiData) -> Unit) {
             tvCategory.text = category.name
             tvCategory.isSelected = category.isSelected
 
             view.setOnClickListener {
                 onClick.invoke(category)
             }
+
+            view.setOnLongClickListener {
+                onLongClick.invoke(category)
+                true
+            }
+
         }
     }
 
diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index 89c7e3e..46b95ee 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -1,5 +1,5 @@
 package com.devspace.taskbeats
-//Onde parei? Terminei aula 16, devo iniciar a 17
+//Onde parei? Terminei aula 17, devo iniciar a 18
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
@@ -50,6 +50,12 @@ class MainActivity : AppCompatActivity() {
             showCreateUpdateTaskBottomSheet(task)
         }
 
+        categoryAdapter.setOnLongClickListener { categoryToBeDeleted ->
+            val categoryEntityToBeDeleted =
+                CategoryEntity(categoryToBeDeleted.name, categoryToBeDeleted.isSelected)
+            deleteCategory(categoryEntityToBeDeleted)
+        }
+
         categoryAdapter.setOnClickListener { selected ->
             if (selected.name == "+") {
                 val createCategoryBottomSheet = CreateCategoryBottomSheet { categoryName ->
@@ -189,6 +195,13 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun deleteCategory(categoryEntity: CategoryEntity) {
+        GlobalScope.launch(Dispatchers.IO) {
+            categoryDao.delete(categoryEntity)
+            getCategoriesFromDataBase()
+        }
+    }
+
     private fun showCreateUpdateTaskBottomSheet(taskUiData: TaskUiData? = null) {
         val createTaskBottomSheet = CreateOrUpdateTaskBottomSheet(
             task = taskUiData,

From 86e76e357887ef5f7637edd4be4150b7e0605e0d Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Tue, 9 Jul 2024 23:25:24 -0300
Subject: [PATCH 19/23] =?UTF-8?q?Terminei=20a=20aula:=2018=20-=20deletando?=
 =?UTF-8?q?=20apenas=20a=20categoria=20-=20detalhamento:=20criamos=20uma?=
 =?UTF-8?q?=20bottom=20sheet=20de=20informa=C3=A7=C3=A3o=20para=20o=20usua?=
 =?UTF-8?q?rio=20confirmar=20que=20quer=20mesmo=20deletar=20a=20categoria,?=
 =?UTF-8?q?=20e=20deixar=20ele=20ciente=20do=20que=20ser=C3=A1=20deletado?=
 =?UTF-8?q?=20(todas=20as=20tarefas=20com=20aquela=20categoria).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/devspace/taskbeats/InfoBottomSheet.kt | 43 +++++++++++++++
 .../com/devspace/taskbeats/MainActivity.kt    | 33 ++++++++++--
 app/src/main/res/layout/create_category.xml   |  4 +-
 app/src/main/res/layout/info_bottom_sheet.xml | 54 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  2 +
 5 files changed, 131 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/com/devspace/taskbeats/InfoBottomSheet.kt
 create mode 100644 app/src/main/res/layout/info_bottom_sheet.xml

diff --git a/app/src/main/java/com/devspace/taskbeats/InfoBottomSheet.kt b/app/src/main/java/com/devspace/taskbeats/InfoBottomSheet.kt
new file mode 100644
index 0000000..24b4d62
--- /dev/null
+++ b/app/src/main/java/com/devspace/taskbeats/InfoBottomSheet.kt
@@ -0,0 +1,43 @@
+package com.devspace.taskbeats
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+
+class InfoBottomSheet(
+    private val title: String,
+    private val description: String,
+    private val btnText: String,
+    private val onClicked: () -> Unit
+) : BottomSheetDialogFragment() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view = inflater.inflate(R.layout.info_bottom_sheet, container, false)
+        val btnDelete = view.findViewById<Button>(R.id.btn_yes)
+        val btnNotDelete = view.findViewById<Button>(R.id.btn_no)
+        val tvTitle = view.findViewById<TextView>(R.id.tv_info_title)
+        val tvDesc = view.findViewById<TextView>(R.id.tv_info_description)
+
+        tvTitle.text = title
+        tvDesc.text = description
+        btnDelete.text = btnText
+
+        btnDelete.setOnClickListener {
+            onClicked.invoke()
+            dismiss()
+        }
+
+        btnNotDelete.setOnClickListener {
+            dismiss()
+        }
+
+        return view
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index 46b95ee..ca65bc8 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -1,5 +1,5 @@
 package com.devspace.taskbeats
-//Onde parei? Terminei aula 17, devo iniciar a 18
+//Onde parei? Terminei aula 18, devo iniciar a 19
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
@@ -51,9 +51,19 @@ class MainActivity : AppCompatActivity() {
         }
 
         categoryAdapter.setOnLongClickListener { categoryToBeDeleted ->
-            val categoryEntityToBeDeleted =
-                CategoryEntity(categoryToBeDeleted.name, categoryToBeDeleted.isSelected)
-            deleteCategory(categoryEntityToBeDeleted)
+            if (categoryToBeDeleted.name != "+") {
+                val title: String = this.getString(R.string.category_delete_title)
+                val desc: String = this.getString(R.string.category_delete_description)
+                val btnText: String = this.getString(R.string.delete)
+                showInfoDialog(
+                    title, desc, btnText
+                )
+                {
+                    val categoryEntityToBeDeleted =
+                        CategoryEntity(categoryToBeDeleted.name, categoryToBeDeleted.isSelected)
+                    deleteCategory(categoryEntityToBeDeleted)
+                }
+            }
         }
 
         categoryAdapter.setOnClickListener { selected ->
@@ -134,6 +144,21 @@ class MainActivity : AppCompatActivity() {
 
     }
 
+    private fun showInfoDialog(
+        title: String,
+        description: String,
+        btnText: String,
+        onClick: () -> Unit
+    ) {
+        val infoBottomSheet = InfoBottomSheet(
+            title = title,
+            description = description,
+            btnText = btnText,
+            onClick
+        )
+        infoBottomSheet.show(supportFragmentManager, "infoBottomSheet")
+    }
+
     private fun getCategoriesFromDataBase() {
         val categoriesFromDb: List<CategoryEntity> = categoryDao.getAll()
         val categoriesUiData =
diff --git a/app/src/main/res/layout/create_category.xml b/app/src/main/res/layout/create_category.xml
index 2161ee6..a7bed46 100644
--- a/app/src/main/res/layout/create_category.xml
+++ b/app/src/main/res/layout/create_category.xml
@@ -2,7 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:padding="16dp"
+    >
 
     <TextView
         android:id="@+id/tv_title"
diff --git a/app/src/main/res/layout/info_bottom_sheet.xml b/app/src/main/res/layout/info_bottom_sheet.xml
new file mode 100644
index 0000000..ba32664
--- /dev/null
+++ b/app/src/main/res/layout/info_bottom_sheet.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/tv_info_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        tools:text="@string/category_delete_title" />
+
+    <TextView
+        android:id="@+id/tv_info_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
+        tools:text="@string/category_delete_description" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="8dp"
+        android:weightSum="2">
+
+        <Button
+            android:id="@+id/btn_yes"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_weight="1"
+            android:text="Yes" />
+
+        <Button
+            android:id="@+id/btn_no"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_weight="1"
+            android:text="No" />
+    </LinearLayout>
+</LinearLayout>
\ 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 9020565..3a00915 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,4 +6,6 @@
     <string name="delete">Delete</string>
     <string name="update_task_title">Update task</string>
     <string name="update">Update</string>
+    <string name="category_delete_title">Important</string>
+    <string name="category_delete_description">By deleting a category you will delete all tasks with this category, are you sure?</string>
 </resources>
\ No newline at end of file

From 8a6964830db9b80bb6c98bcc6cb732eee7d4af92 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Wed, 10 Jul 2024 07:14:19 -0300
Subject: [PATCH 20/23] =?UTF-8?q?Terminei=20a=20aula:=2019=20-=20nela=20ap?=
 =?UTF-8?q?rendemos=20a=20relacionar=20as=20tabelas=20criando=20foreignkey?=
 =?UTF-8?q?=20na=20categoryDao,=20e=20criamos=20uma=20fun=C3=A7=C3=A3o=20n?=
 =?UTF-8?q?a=20taskDao=20que=20nada=20mais=20=C3=A9=20que=20uma=20query=20?=
 =?UTF-8?q?que=20busca=20as=20tarefas=20em=20espec=C3=ADfico=20com=20a=20i?=
 =?UTF-8?q?nten=C3=A7=C3=A3o=20de=20delet=C3=A1-las.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/devspace/taskbeats/MainActivity.kt   | 3 +++
 .../main/java/com/devspace/taskbeats/TaskBeatDataBase.kt   | 2 +-
 app/src/main/java/com/devspace/taskbeats/TaskDao.kt        | 6 ++++++
 app/src/main/java/com/devspace/taskbeats/TaskEntity.kt     | 7 ++++++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index ca65bc8..30eb9cd 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -222,8 +222,11 @@ class MainActivity : AppCompatActivity() {
 
     private fun deleteCategory(categoryEntity: CategoryEntity) {
         GlobalScope.launch(Dispatchers.IO) {
+            val tasksToBeDeleted = taskDao.getAllByCategoryName(categoryEntity.name)
+            taskDao.deleteAll(tasksToBeDeleted)
             categoryDao.delete(categoryEntity)
             getCategoriesFromDataBase()
+            getTasksFromDataBase()
         }
     }
 
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskBeatDataBase.kt b/app/src/main/java/com/devspace/taskbeats/TaskBeatDataBase.kt
index 36d1fa6..ffa691d 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskBeatDataBase.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskBeatDataBase.kt
@@ -3,7 +3,7 @@ package com.devspace.taskbeats
 import androidx.room.Database
 import androidx.room.RoomDatabase
 
-@Database([CategoryEntity::class,TaskEntity::class],version = 3)
+@Database([CategoryEntity::class,TaskEntity::class],version = 4)
 abstract class TaskBeatDataBase : RoomDatabase() {
 
     abstract fun getCategoryDao(): CategoryDao
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskDao.kt b/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
index 0699b3a..9c67c12 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
@@ -23,4 +23,10 @@ interface TaskDao {
 
     @Delete
     fun delete(taskEntity: TaskEntity)
+
+    @Delete
+    fun deleteAll(taskEntity: List<TaskEntity>)
+
+    @Query("Select * From taskentity where category is :categoryName ORDER BY id ASC")
+    fun getAllByCategoryName(categoryName: String): List<TaskEntity>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt b/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
index e555fba..cf2b086 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
@@ -10,7 +10,12 @@ import androidx.room.PrimaryKey
     tableName = "taskentity",
     indices = [
         Index(value = ["name", "category"], unique = true)
-    ]
+    ],
+    foreignKeys = [ForeignKey(
+        entity = CategoryEntity::class,
+        parentColumns = ["key"],
+        childColumns = ["category"]
+    )]
 )
 data class TaskEntity(
     @PrimaryKey(autoGenerate = true)

From 7554db8fcb682082912227e0ae168d994050440e Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Wed, 10 Jul 2024 07:19:35 -0300
Subject: [PATCH 21/23] =?UTF-8?q?Terminei=20a=20aula:=2019=20-=20nela=20ap?=
 =?UTF-8?q?rendemos=20a=20relacionar=20as=20tabelas=20criando=20foreignkey?=
 =?UTF-8?q?=20na=20categoryDao,=20e=20criamos=20uma=20fun=C3=A7=C3=A3o=20n?=
 =?UTF-8?q?a=20taskDao=20que=20nada=20mais=20=C3=A9=20que=20uma=20query=20?=
 =?UTF-8?q?que=20busca=20as=20tarefas=20em=20espec=C3=ADfico=20com=20a=20i?=
 =?UTF-8?q?nten=C3=A7=C3=A3o=20de=20delet=C3=A1-las.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/devspace/taskbeats/MainActivity.kt | 2 +-
 app/src/main/java/com/devspace/taskbeats/TaskEntity.kt   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index 30eb9cd..e9e8585 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -1,5 +1,5 @@
 package com.devspace.taskbeats
-//Onde parei? Terminei aula 18, devo iniciar a 19
+//Onde parei? Terminei aula 19, devo iniciar a 20
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt b/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
index cf2b086..176c0a6 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskEntity.kt
@@ -24,5 +24,4 @@ data class TaskEntity(
     val name: String,
     @ColumnInfo
     val category: String
-)
-
+)
\ No newline at end of file

From 2a166dbcf8268f9840004911a77c15580395daad Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Wed, 10 Jul 2024 08:30:02 -0300
Subject: [PATCH 22/23] =?UTF-8?q?Terminei=20a=20aula:=2020=20-=20nela=20eu?=
 =?UTF-8?q?=20tive=20uma=20grande=20dor=20de=20cabe=C3=A7a,=20coloquei=20o?=
 =?UTF-8?q?=20conflito=20para=20ignorar=20ao=20inv=C3=A9s=20de=20replace.?=
 =?UTF-8?q?=20Replace=20estava=20apagando=20tudo=20e=20criando=20de=20novo?=
 =?UTF-8?q?.=20Reajuste=20nos=20if=20de=20testes.=20Na=20aula=2021=20vamos?=
 =?UTF-8?q?=20fazer=20uma=20query=20direta=20para=20o=20bot=C3=A3o=20"All"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/devspace/taskbeats/CategoryDao.kt     |  4 +--
 .../com/devspace/taskbeats/MainActivity.kt    | 28 ++++++++-----------
 .../java/com/devspace/taskbeats/TaskDao.kt    |  4 +--
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/CategoryDao.kt b/app/src/main/java/com/devspace/taskbeats/CategoryDao.kt
index 3319d73..490584a 100644
--- a/app/src/main/java/com/devspace/taskbeats/CategoryDao.kt
+++ b/app/src/main/java/com/devspace/taskbeats/CategoryDao.kt
@@ -12,11 +12,11 @@ interface CategoryDao {
     @Query("Select * From categoryentity")
     fun getAll(): List<CategoryEntity>
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
     fun insetAll(categoryEntity: List<CategoryEntity>) //removemos o vararg e usamos a lista
     //mesmo com a documentação dizendo pra usar vararg e nao usar lista.
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
     fun inset(categoryEntity: CategoryEntity)
 
     @Delete
diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index e9e8585..2efc41f 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -79,11 +79,9 @@ class MainActivity : AppCompatActivity() {
             } else {
                 val categoryTemp = categoriess.map { item ->
                     when {
-                        item.name == selected.name && !item.isSelected -> item.copy(
-                            isSelected = true
-                        )
-
-                        item.name == selected.name && item.isSelected -> item.copy(isSelected = false)
+                        item.name == selected.name && item.isSelected -> item.copy(isSelected = true)
+                        item.name == selected.name && !item.isSelected -> item.copy(isSelected = true)
+                        item.name != selected.name && item.isSelected -> item.copy(isSelected = false)
                         else -> item
                     }
                 }
@@ -165,16 +163,16 @@ class MainActivity : AppCompatActivity() {
             categoriesFromDb.map { //Aqui é o contrário do que está sendo feito na linha 64: estamos pegando do banco de dados e puxando pra lista de novo.
                 CategoryUiData(name = it.name, isSelected = it.isSelected)
             }.toMutableList() //esse tomutablelist serve pro que tá no nome mutablelist
-
         //daqui pra baixo, eu só tô criando o botão de adiçonar
         val list = listOf<CategoryUiData>()
         val mutableList = mutableListOf<CategoryUiData>()
         categoriesUiData.add(CategoryUiData(name = "+", isSelected = false))
+        val tempCategory = mutableListOf(CategoryUiData(name = "ALL", isSelected = true))
+        tempCategory.addAll(categoriesUiData)
         GlobalScope.launch(Dispatchers.Main) {
-            categoriess = categoriesUiData
-            categoryAdapter.submitList(categoriesUiData)
+            categoriess = tempCategory
+            categoryAdapter.submitList(categoriess)
         }
-
     }
 
     private fun getTasksFromDataBase() {
@@ -188,7 +186,7 @@ class MainActivity : AppCompatActivity() {
         }
         GlobalScope.launch(Dispatchers.Main) {
             taskss = tasksUiData
-            taskAdapter.submitList(tasksUiData)
+            taskAdapter.submitList(taskss)
         }
     }
 
@@ -266,10 +264,10 @@ class MainActivity : AppCompatActivity() {
 //
 val categories: List<CategoryUiData> = listOf(
     //Lista vazia pra testar se o dado foi pro DB mesmo.
-    CategoryUiData(
+    /*CategoryUiData(
         name = "ALL",
         isSelected = false
-    ),
+    ),*/
     CategoryUiData(
         name = "STUDY",
         isSelected = false
@@ -301,11 +299,7 @@ val categories: List<CategoryUiData> = listOf(
     CategoryUiData(
         name = "HEALTH",
         isSelected = false
-    ),
-    CategoryUiData(
-        name = "HEALTH",
-        isSelected = false
-    ),
+    )
 )
 
 
diff --git a/app/src/main/java/com/devspace/taskbeats/TaskDao.kt b/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
index 9c67c12..7d119e5 100644
--- a/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
+++ b/app/src/main/java/com/devspace/taskbeats/TaskDao.kt
@@ -12,10 +12,10 @@ interface TaskDao {
     @Query("Select * From taskentity ORDER BY id ASC")
     fun getAll(): List<TaskEntity>
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
     fun insertAll(taskEntity: List<TaskEntity>)
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
     fun insert(taskEntity: TaskEntity)
 
     @Update

From 4a70057954c4d40e537cf428f5cbdb29a2510d34 Mon Sep 17 00:00:00 2001
From: alanliongar <129612933+alanliongar@users.noreply.github.com>
Date: Wed, 10 Jul 2024 08:30:16 -0300
Subject: [PATCH 23/23] =?UTF-8?q?Terminei=20a=20aula:=2020=20-=20nela=20eu?=
 =?UTF-8?q?=20tive=20uma=20grande=20dor=20de=20cabe=C3=A7a,=20coloquei=20o?=
 =?UTF-8?q?=20conflito=20para=20ignorar=20ao=20inv=C3=A9s=20de=20replace.?=
 =?UTF-8?q?=20Replace=20estava=20apagando=20tudo=20e=20criando=20de=20novo?=
 =?UTF-8?q?.=20Reajuste=20nos=20if=20de=20testes.=20Na=20aula=2021=20vamos?=
 =?UTF-8?q?=20fazer=20uma=20query=20direta=20para=20o=20bot=C3=A3o=20"All"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/devspace/taskbeats/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
index 2efc41f..d558e8e 100644
--- a/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
+++ b/app/src/main/java/com/devspace/taskbeats/MainActivity.kt
@@ -1,5 +1,5 @@
 package com.devspace.taskbeats
-//Onde parei? Terminei aula 19, devo iniciar a 20
+//Onde parei? Terminei aula 20, devo iniciar a 21
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.recyclerview.widget.RecyclerView