archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Prevent flashing empty inbox when switching lists

Browse Source
pull/2620/head
Alex Baker 7 months ago
parent a52b1200f5
commit 8895acbf6b
3 changed files with 71 additions and 39 deletions
Show Stats Download Patch File Download Diff File

20
app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
Unescape Escape View File

@ -280,16 +280,18 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
lifecycleScope.launch { lifecycleScope.launch {
viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
listViewModel.state.collect { listViewModel.state.collect {
submitList(it.tasks) if (it.tasks is TaskListViewModel.TasksResults.Results) {
if (it.tasks.isEmpty()) { submitList(it.tasks.tasks)
swipeRefreshLayout.visibility = View.GONE if (it.tasks.tasks.isEmpty()) {
emptyRefreshLayout.visibility = View.VISIBLE swipeRefreshLayout.visibility = View.GONE
} else { emptyRefreshLayout.visibility = View.VISIBLE
swipeRefreshLayout.visibility = View.VISIBLE } else {
emptyRefreshLayout.visibility = View.GONE swipeRefreshLayout.visibility = View.VISIBLE
emptyRefreshLayout.visibility = View.GONE
}
swipeRefreshLayout.isRefreshing = it.syncOngoing
emptyRefreshLayout.isRefreshing = it.syncOngoing
} }
swipeRefreshLayout.isRefreshing = it.syncOngoing
emptyRefreshLayout.isRefreshing = it.syncOngoing
} }
} }
} }

81
app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt
Unescape Escape View File

@ -3,14 +3,24 @@ package org.tasks.compose.edit
import android.content.res.Configuration import android.content.res.Configuration
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.focusable import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.BasicTextField
import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.ContentAlpha import androidx.compose.material.ContentAlpha
import androidx.compose.material.MaterialTheme import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.runtime.* import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.alpha
@ -27,8 +37,14 @@ import com.google.android.material.composethemeadapter.MdcTheme
import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.Filter
import com.todoroo.astrid.api.GtasksFilter import com.todoroo.astrid.api.GtasksFilter
import com.todoroo.astrid.data.Task import com.todoroo.astrid.data.Task
import org.tasks.compose.* import org.tasks.compose.CheckBox
import org.tasks.compose.ClearButton
import org.tasks.compose.DisabledText
import org.tasks.compose.SubtaskChip
import org.tasks.compose.TaskEditIcon
import org.tasks.compose.TaskEditRow
import org.tasks.data.TaskContainer import org.tasks.data.TaskContainer
import org.tasks.ui.TaskListViewModel
@Composable @Composable
fun SubtaskRow( fun SubtaskRow(
@ -36,7 +52,7 @@ fun SubtaskRow(
filter: Filter?, filter: Filter?,
hasParent: Boolean, hasParent: Boolean,
desaturate: Boolean, desaturate: Boolean,
existingSubtasks: List<TaskContainer>, existingSubtasks: TaskListViewModel.TasksResults,
newSubtasks: List<Task>, newSubtasks: List<Task>,
openSubtask: (Task) -> Unit, openSubtask: (Task) -> Unit,
completeExistingSubtask: (Task, Boolean) -> Unit, completeExistingSubtask: (Task, Boolean) -> Unit,
@ -73,15 +89,22 @@ fun SubtaskRow(
) )
} else { } else {
Spacer(modifier = Modifier.height(height = 8.dp)) Spacer(modifier = Modifier.height(height = 8.dp))
existingSubtasks.forEach { task -> if (existingSubtasks is TaskListViewModel.TasksResults.Results) {
ExistingSubtaskRow( existingSubtasks.tasks.forEach { task ->
task = task, ExistingSubtaskRow(
desaturate = desaturate, task = task,
indent = if (filter !is GtasksFilter) task.indent else 0, desaturate = desaturate,
onRowClick = { openSubtask(task.task) }, indent = if (filter !is GtasksFilter) task.indent else 0,
onCompleteClick = { completeExistingSubtask(task.task, !task.isCompleted) }, onRowClick = { openSubtask(task.task) },
onToggleSubtaskClick = { toggleSubtask(task.id, !task.isCollapsed) } onCompleteClick = {
) completeExistingSubtask(
task.task,
!task.isCompleted
)
},
onToggleSubtaskClick = { toggleSubtask(task.id, !task.isCollapsed) }
)
}
} }
newSubtasks.forEach { subtask -> newSubtasks.forEach { subtask ->
NewSubtaskRow( NewSubtaskRow(
@ -214,7 +237,7 @@ fun NoSubtasks() {
filter = null, filter = null,
hasParent = false, hasParent = false,
desaturate = true, desaturate = true,
existingSubtasks = emptyList(), existingSubtasks = TaskListViewModel.TasksResults.Results(emptyList()),
newSubtasks = emptyList(), newSubtasks = emptyList(),
openSubtask = {}, openSubtask = {},
completeExistingSubtask = { _, _ -> }, completeExistingSubtask = { _, _ -> },
@ -236,20 +259,22 @@ fun SubtasksPreview() {
filter = null, filter = null,
hasParent = false, hasParent = false,
desaturate = true, desaturate = true,
existingSubtasks = listOf( existingSubtasks = TaskListViewModel.TasksResults.Results(
TaskContainer( listOf(
task = Task().apply { TaskContainer(
title = "Existing subtask 1" task = Task(
priority = Task.Priority.HIGH title = "Existing subtask 1",
}, priority = Task.Priority.HIGH,
indent = 0 ),
), indent = 0
TaskContainer( ),
task = Task().apply { TaskContainer(
title = "Existing subtask 2 with a really long title" task = Task(
priority = Task.Priority.LOW title = "Existing subtask 2 with a really long title",
}, priority = Task.Priority.LOW,
indent = 1 ),
indent = 1
)
) )
), ),
newSubtasks = listOf( newSubtasks = listOf(

9
app/src/main/java/org/tasks/ui/TaskListViewModel.kt
Unescape Escape View File

@ -47,11 +47,16 @@ class TaskListViewModel @Inject constructor(
private val firebase: Firebase, private val firebase: Firebase,
) : ViewModel() { ) : ViewModel() {
sealed interface TasksResults {
data object Loading : TasksResults
data class Results(val tasks: List<TaskContainer>) : TasksResults
}
data class State( data class State(
val filter: Filter? = null, val filter: Filter? = null,
val now: Long = DateUtilities.now(), val now: Long = DateUtilities.now(),
val searchQuery: String? = null, val searchQuery: String? = null,
val tasks: List<TaskContainer> = emptyList(), val tasks: TasksResults = TasksResults.Loading,
val begForSubscription: Boolean = false, val begForSubscription: Boolean = false,
val syncOngoing: Boolean = false, val syncOngoing: Boolean = false,
) )
@ -116,7 +121,7 @@ class TaskListViewModel @Inject constructor(
} }
.onEach { tasks -> .onEach { tasks ->
_state.update { _state.update {
it.copy(tasks = tasks) it.copy(tasks = TasksResults.Results(tasks))
} }
} }
.flowOn(Dispatchers.Default) .flowOn(Dispatchers.Default)

Write Preview
Loading…
Cancel
Save