sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve assigning UX

Browse source
This commit is contained in:
Phillip Thelen 2023-03-29 12:45:28 +02:00
parent 99816e05a7
commit edf8d5bbe3
1 changed files with 37 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
View file

@ -143,7 +143,7 @@ class TaskFormActivity : BaseActivity() {
private var taskType: TaskType = TaskType.HABIT
private var tags = listOf<Tag>()
private var groupID: String? = null
private var groupMembers = listOf<Member>()
private var groupMembers = mutableStateListOf<Member>()
private var assignedIDs = mutableStateListOf<String>()
private var taskCompletedMap = mutableStateMapOf<String, Date>()
private var preselectedTags: ArrayList<String>? = null
@ -249,40 +249,6 @@ class TaskFormActivity : BaseActivity() {
}
}
if (groupID != null) {
binding.assignView.setContent {
HabiticaTheme {
AssignedView(
groupMembers.filter { assignedIDs.contains(it.id) },
taskCompletedMap,
HabiticaTheme.colors.windowBackgroundFor(task),
HabiticaTheme.colors.textPrimaryFor(task),
{
showAssignDialog()
},
{
taskCompletedMap.remove(it)
lifecycleScope.launch(Dispatchers.Main) {
task?.let { it1 -> taskRepository.markTaskNeedsWork(it1, it) }
}
},
showEditButton = true
)
}
}
lifecycleScope.launch(Dispatchers.Main) {
socialRepository.getGroupMembers(groupID ?: "").collect {
groupMembers = it
}
}
binding.tagsTitleView.isVisible = false
binding.tagsWrapper.isVisible = false
} else {
binding.assignTitleView.visibility = View.GONE
binding.assignView.visibility = View.GONE
}
title = ""
when {
@ -333,6 +299,42 @@ class TaskFormActivity : BaseActivity() {
}
}
if (groupID != null) {
binding.assignView.setContent {
HabiticaTheme {
AssignedView(
groupMembers.filter { assignedIDs.contains(it.id) },
taskCompletedMap,
HabiticaTheme.colors.windowBackgroundFor(task),
HabiticaTheme.colors.textPrimaryFor(task),
{
showAssignDialog()
},
{
taskCompletedMap.remove(it)
lifecycleScope.launch(Dispatchers.Main) {
task?.let { it1 -> taskRepository.markTaskNeedsWork(it1, it) }
}
},
showEditButton = true
)
}
}
lifecycleScope.launch(Dispatchers.Main) {
socialRepository.getGroupMembers(groupID ?: "").collect {
groupMembers.clear()
groupMembers.addAll(it)
}
}
binding.tagsTitleView.isVisible = false
binding.tagsWrapper.isVisible = false
} else {
binding.assignTitleView.visibility = View.GONE
binding.assignView.visibility = View.GONE
}
binding.taskDifficultyButtons.setContent {
HabiticaTheme {
TaskDifficultySelector(