From 809c5622f99332ee2d68f93ccfd2f69c7b403d9d Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 5 Feb 2025 00:39:24 -0600 Subject: [PATCH] Fix list chip when subtask in top level --- app/src/main/java/org/tasks/compose/Chip.kt | 2 -- app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/java/org/tasks/compose/Chip.kt b/app/src/main/java/org/tasks/compose/Chip.kt index acf73087d..a937d4350 100644 --- a/app/src/main/java/org/tasks/compose/Chip.kt +++ b/app/src/main/java/org/tasks/compose/Chip.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.defaultMinSize import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Cancel -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FilterChip import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.Icon @@ -50,7 +49,6 @@ fun Chip( ) } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun Chip( text: String? = null, diff --git a/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt b/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt index 83cb793e2..3fcd8ceb4 100644 --- a/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt +++ b/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt @@ -248,7 +248,6 @@ class TaskViewHolder internal constructor( val place = task.location?.place val list = task.caldav val tagsString = task.tagsString - val isSubtask = task.hasParent() val appearance = preferences.getIntegerFromString(R.string.p_chip_appearance, 0) val showText = appearance != 2 val showIcon = appearance != 1 @@ -291,7 +290,7 @@ class TaskViewHolder internal constructor( } if ( - !isSubtask && + indent == 0 && !sortByList && preferences.showListChip && filter !is CaldavFilter