Fix list chip when subtask in top level

pull/3321/head
Alex Baker 10 months ago
parent 1a1eefbbab
commit 809c5622f9

@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Cancel import androidx.compose.material.icons.outlined.Cancel
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FilterChip import androidx.compose.material3.FilterChip
import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.FilterChipDefaults
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
@ -50,7 +49,6 @@ fun Chip(
) )
} }
@OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
fun Chip( fun Chip(
text: String? = null, text: String? = null,

@ -248,7 +248,6 @@ class TaskViewHolder internal constructor(
val place = task.location?.place val place = task.location?.place
val list = task.caldav val list = task.caldav
val tagsString = task.tagsString val tagsString = task.tagsString
val isSubtask = task.hasParent()
val appearance = preferences.getIntegerFromString(R.string.p_chip_appearance, 0) val appearance = preferences.getIntegerFromString(R.string.p_chip_appearance, 0)
val showText = appearance != 2 val showText = appearance != 2
val showIcon = appearance != 1 val showIcon = appearance != 1
@ -291,7 +290,7 @@ class TaskViewHolder internal constructor(
} }
if ( if (
!isSubtask && indent == 0 &&
!sortByList && !sortByList &&
preferences.showListChip && preferences.showListChip &&
filter !is CaldavFilter filter !is CaldavFilter

Loading…
Cancel
Save