From 5a27d7cd98571ef6bc25a09e6686e1a90690a476 Mon Sep 17 00:00:00 2001 From: Dinesh Thiyagarajan Date: Thu, 5 Sep 2024 20:48:32 +0530 Subject: [PATCH] Bug fix #2064. Updated Task Notes expanded state logic (#2077) --- .../habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt index 128774df6..ab29ab4fc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt @@ -105,7 +105,10 @@ abstract class BaseTaskViewHolder( notesTextView?.movementMethod = LinkMovementMethod.getInstance() titleTextView.movementMethod = LinkMovementMethod.getInstance() - expandNotesButton?.setOnClickListener { expandTask() } + expandNotesButton?.setOnClickListener { + notesExpanded = !notesExpanded + updateExpandedTaskLogic() + } iconViewChallenge?.setOnClickListener { task?.let { t -> if (task?.challengeBroken?.isNotBlank() == true) brokenTaskFunc(t) @@ -127,8 +130,7 @@ abstract class BaseTaskViewHolder( context = itemView.context } - private fun expandTask() { - notesExpanded = !notesExpanded + private fun updateExpandedTaskLogic() { if (notesExpanded) { notesTextView?.maxLines = 100 expandNotesButton?.text = context.getString(R.string.collapse_notes) @@ -162,6 +164,7 @@ abstract class BaseTaskViewHolder( if (data.notes?.isNotEmpty() == true) { notesTextView?.visibility = View.VISIBLE notesTextView?.setTextColor(ContextCompat.getColor(context, R.color.text_ternary)) + updateExpandedTaskLogic() } else { notesTextView?.visibility = View.GONE }