sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 20:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix task editing. Fixes #1190

Browse source
This commit is contained in:
Phillip Thelen 2019-06-14 11:10:45 +02:00
parent 65e284505a
commit 6820ffcc66
2 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
View file

@ -294,17 +294,6 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
outState.putString(CLASS_TYPE_KEY, this.classType)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
when (requestCode) {
TasksFragment.TASK_CREATED_RESULT -> {
TasksFragment.displayingTaskForm = false
}
TasksFragment.TASK_UPDATED_RESULT -> TasksFragment.displayingTaskForm = false
}
}
override val displayedClassName: String?
get() = this.classType + super.displayedClassName
@ -326,7 +315,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
}
private fun openTaskForm(task: Task) {
if (TasksFragment.displayingTaskForm) {
if (Date().time - (TasksFragment.lastTaskFormOpen?.time ?: 0) < 2000) {
return
}
@ -336,7 +325,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
val intent = Intent(activity, TaskFormActivity::class.java)
intent.putExtras(bundle)
TasksFragment.displayingTaskForm = true
TasksFragment.lastTaskFormOpen = Date()
if (isAdded) {
startActivityForResult(intent, TasksFragment.TASK_UPDATED_RESULT)
}

8
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
View file

@ -254,7 +254,7 @@ class TasksFragment : BaseMainFragment() {
// endregion
private fun openNewTaskActivity(type: String) {
if (displayingTaskForm) {
if (Date().time - (lastTaskFormOpen?.time ?: 0) < 2000) {
return
}
@ -276,7 +276,7 @@ class TasksFragment : BaseMainFragment() {
intent.putExtras(bundle)
intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
if (this.isAdded) {
displayingTaskForm = true
lastTaskFormOpen = Date()
startActivityForResult(intent, TASK_CREATED_RESULT)
}
}
@ -288,10 +288,8 @@ class TasksFragment : BaseMainFragment() {
when (requestCode) {
TASK_CREATED_RESULT -> {
displayingTaskForm = false
onTaskCreatedResult(resultCode, data)
}
TASK_UPDATED_RESULT -> displayingTaskForm = false
}
}
@ -330,7 +328,7 @@ class TasksFragment : BaseMainFragment() {
override fun addToBackStack(): Boolean = false
companion object {
var displayingTaskForm: Boolean = false
var lastTaskFormOpen: Date? = null
internal const val TASK_CREATED_RESULT = 1
const val TASK_UPDATED_RESULT = 2
}