From b851055f94ee1743713c5eda8fa9a0326d960946 Mon Sep 17 00:00:00 2001
From: Monnot <48322244+Saigai@users.noreply.github.com>
Date: Wed, 30 Dec 2020 17:33:04 +0100
Subject: [PATCH] Modified the previous commit to be like asked in the TD3
---
.../clemhaowen/dm_td2/task/TaskActivity.kt | 21 +++++--------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/app/src/main/java/com/clemhaowen/dm_td2/task/TaskActivity.kt b/app/src/main/java/com/clemhaowen/dm_td2/task/TaskActivity.kt
index 6f98cce..cb945c9 100644
--- a/app/src/main/java/com/clemhaowen/dm_td2/task/TaskActivity.kt
+++ b/app/src/main/java/com/clemhaowen/dm_td2/task/TaskActivity.kt
@@ -21,23 +21,12 @@ class TaskActivity : AppCompatActivity() {
var resultCode = 666
val titleEditText = findViewById<EditText>(R.id.titleEditText)
val descriptionEditText = findViewById<EditText>(R.id.descriptionEditText)
- val serializableExtra = intent?.getSerializableExtra("editTask")
- var task : Task
- var id : String = ""
- if (serializableExtra != null){
- task = serializableExtra as Task
- titleEditText.setText(task.title)
- descriptionEditText.setText(task.description)
- resultCode = 667
- id = task.id
- }
+ //val serializableExtra = intent?.getSerializableExtra("editTask")
+ val task = intent?.getSerializableExtra("editTask") as? Task
+ titleEditText.setText(task?.title)
+ descriptionEditText.setText(task?.description)
createButton.setOnClickListener{
- var newTask : Task
-
- if (resultCode == 666){
- id = java.util.UUID.randomUUID().toString()
- }
- newTask = Task(id = id, title = titleEditText.text.toString(), description = descriptionEditText.text.toString())
+ var newTask = Task(id = task?.id ?: java.util.UUID.randomUUID().toString(), title = titleEditText.text.toString(), description = descriptionEditText.text.toString())
intent.putExtra("newTask", newTask)
setResult(resultCode, intent)
--
GitLab