Fix nested scrolling crash

pull/3207/head
Alex Baker 12 months ago
parent 761ba583b5
commit 3191de2473

@ -5,8 +5,6 @@ import android.content.Intent
import android.os.Bundle
import androidx.activity.compose.setContent
import androidx.activity.viewModels
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Help
import androidx.compose.material3.Icon
@ -16,8 +14,6 @@ import androidx.compose.runtime.MutableState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.lifecycleScope
@ -171,10 +167,6 @@ class FilterSettingsActivity : BaseListSettingsActivity() {
private fun ActivityContent ()
{
TasksTheme {
Box( // to layout FAB over the main content
modifier = Modifier.fillMaxSize(),
contentAlignment = Alignment.TopStart
) {
val viewState by viewModel.viewState.collectAsStateWithLifecycle()
BaseSettingsContent(
optionButton = {
@ -183,6 +175,9 @@ class FilterSettingsActivity : BaseListSettingsActivity() {
Icon(imageVector = Icons.Outlined.Help, contentDescription = "")
}
} else DeleteButton(filter?.title ?: ""){ delete() }
},
fab = {
NewCriterionFAB(viewState.fabExtended) { newCriterion() }
}
) {
FilterCondition(
@ -193,8 +188,6 @@ class FilterSettingsActivity : BaseListSettingsActivity() {
)
}
NewCriterionFAB(viewState.fabExtended) { newCriterion() }
/** edit given criterion type (AND|OR|NOT) **/
editCriterionType.value?.let { itemId ->
val index = viewState.criteria.indexOfFirst { it.id == itemId }
@ -287,7 +280,6 @@ class FilterSettingsActivity : BaseListSettingsActivity() {
}
} /* end given criteria options dialog */
}
}
} /* activityContent */
companion object {

@ -155,9 +155,9 @@ object FilterCondition {
Row {
LazyColumn(
modifier = Modifier
.fillMaxSize()
.height(56.dp * items.size)
.doDrag(dragDropState),
userScrollEnabled = true,
userScrollEnabled = false,
state = listState
) {
itemsIndexed(

Loading…
Cancel
Save