Skip to content
Extraits de code Groupes Projets
Valider 64556663 rédigé par Monnot's avatar Monnot
Parcourir les fichiers

Editing a task works and fixed adding a task

parent 5b469699
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -18,12 +18,29 @@ class TaskActivity : AppCompatActivity() { ...@@ -18,12 +18,29 @@ class TaskActivity : AppCompatActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_task) setContentView(R.layout.activity_task)
val createButton = findViewById<Button>(R.id.button) val createButton = findViewById<Button>(R.id.button)
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
}
createButton.setOnClickListener{ createButton.setOnClickListener{
val titleText = findViewById<EditText>(R.id.titleEditText).text var newTask : Task
val descriptionText = findViewById<EditText>(R.id.descriptionEditText).text
val newTask = Task(id = java.util.UUID.randomUUID().toString(), title = titleText.toString(), description = descriptionText.toString()) if (resultCode == 666){
id = java.util.UUID.randomUUID().toString()
}
newTask = Task(id = id, title = titleEditText.text.toString(), description = descriptionEditText.text.toString())
intent.putExtra("newTask", newTask) intent.putExtra("newTask", newTask)
setResult(666, intent) setResult(resultCode, intent)
TASK_KEY = "newTask" TASK_KEY = "newTask"
finish() finish()
} }
......
...@@ -38,6 +38,7 @@ class TaskListFragment : Fragment() { ...@@ -38,6 +38,7 @@ class TaskListFragment : Fragment() {
companion object { companion object {
const val ADD_TASK_REQUEST_CODE = 666 const val ADD_TASK_REQUEST_CODE = 666
const val EDIT_TASK_REQUEST_CODE = 667
} }
override fun onCreateView( override fun onCreateView(
...@@ -67,9 +68,10 @@ class TaskListFragment : Fragment() { ...@@ -67,9 +68,10 @@ class TaskListFragment : Fragment() {
} }
(recyclerView?.adapter as TaskListAdapter).onEditClickListener = { task -> (recyclerView?.adapter as TaskListAdapter).onEditClickListener = { task ->
lifecycleScope.launch { val intent = Intent(activity, TaskActivity::class.java)
tasksRepository.updateTask(task) intent.putExtra("editTask", task)
} startActivityForResult(intent, EDIT_TASK_REQUEST_CODE)
(recyclerView?.adapter as TaskListAdapter).notifyDataSetChanged()
} }
tasksRepository.taskList.observe(viewLifecycleOwner, androidx.lifecycle.Observer { tasksRepository.taskList.observe(viewLifecycleOwner, androidx.lifecycle.Observer {
...@@ -98,7 +100,15 @@ class TaskListFragment : Fragment() { ...@@ -98,7 +100,15 @@ class TaskListFragment : Fragment() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
val task = data!!.getSerializableExtra(TaskActivity.TASK_KEY) as Task val task = data!!.getSerializableExtra(TaskActivity.TASK_KEY) as Task
taskList.add(task) lifecycleScope.launch {
if (requestCode == ADD_TASK_REQUEST_CODE) {
tasksRepository.addTask(task)
}
else if (requestCode == EDIT_TASK_REQUEST_CODE){
tasksRepository.updateTask(task)
}
}
//taskList.add(task)
} }
override fun onResume() { override fun onResume() {
...@@ -108,13 +118,14 @@ class TaskListFragment : Fragment() { ...@@ -108,13 +118,14 @@ class TaskListFragment : Fragment() {
crossfade(true) crossfade(true)
transformations(CircleCropTransformation()) transformations(CircleCropTransformation())
} }
lifecycleScope.launch { /*lifecycleScope.launch {
tasksRepository.refresh() tasksRepository.refresh()
} }*/
lifecycleScope.launch { lifecycleScope.launch {
val userInfo = Api.userService.getInfo().body()!! val userInfo = Api.userService.getInfo().body()!!
val textView = view?.findViewById<TextView>(R.id.textViewInfo) val textView = view?.findViewById<TextView>(R.id.textViewInfo)
textView?.text = "${userInfo.firstName} ${userInfo.lastName}" textView?.text = "${userInfo.firstName} ${userInfo.lastName}"
tasksRepository.refresh()
} }
} }
} }
\ No newline at end of file
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter