admin/honeyDueKMP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Trey t
2025-11-05 18:02:34 -06:00
parent 194bac1a86
commit b2b8cc62de
4 changed files with 125 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composeApp/src/commonMain/kotlin/com/example/mycrib/models/CustomTask.kt
View File

@@ -76,6 +76,7 @@ data class TasksByResidenceResponse(
@SerialName("residence_id") val residenceId: String,
val summary: TaskSummary,
val tasks: List<TaskDetail>,
@SerialName("completed_tasks") val completedTasks: List<TaskDetail> = emptyList(),
@SerialName("cancelled_tasks") val cancelledTasks: List<TaskDetail> = emptyList()
)

63
composeApp/src/commonMain/kotlin/com/example/mycrib/ui/screens/ResidenceDetailScreen.kt
View File

@@ -1,5 +1,6 @@
package com.mycrib.android.ui.screens
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
@@ -47,6 +48,7 @@ fun ResidenceDetailScreen(
var showCompleteDialog by remember { mutableStateOf(false) }
var selectedTask by remember { mutableStateOf<TaskDetail?>(null) }
var showNewTaskDialog by remember { mutableStateOf(false) }
var showCompletedTasks by remember { mutableStateOf(false) }
var showCancelledTasks by remember { mutableStateOf(false) }
LaunchedEffect(residenceId) {
@@ -392,7 +394,7 @@ fun ResidenceDetailScreen(
}
is ApiResult.Success -> {
val taskData = (tasksState as ApiResult.Success).data
if (taskData.tasks.isEmpty() && taskData.cancelledTasks.isEmpty()) {
if (taskData.tasks.isEmpty() && taskData.completedTasks.isEmpty() && taskData.cancelledTasks.isEmpty()) {
item {
Card(
modifier = Modifier.fillMaxWidth(),
@@ -442,6 +444,56 @@ fun ResidenceDetailScreen(
)
}
// Completed tasks section
if (taskData.completedTasks.isNotEmpty()) {
item {
Spacer(modifier = Modifier.height(8.dp))
Row(
modifier = Modifier
.fillMaxWidth()
.clickable { showCompletedTasks = !showCompletedTasks }
.padding(vertical = 8.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
Icons.Default.CheckCircle,
contentDescription = null,
tint = MaterialTheme.colorScheme.tertiary,
modifier = Modifier.size(28.dp)
)
Spacer(modifier = Modifier.width(8.dp))
Text(
text = "Completed Tasks (${taskData.completedTasks.size})",
style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.tertiary
)
}
Icon(
if (showCompletedTasks) Icons.Default.KeyboardArrowUp else Icons.Default.KeyboardArrowDown,
contentDescription = null,
tint = MaterialTheme.colorScheme.onSurfaceVariant
)
}
}
if (showCompletedTasks) {
items(taskData.completedTasks) { task ->
TaskCard(
task = task,
onCompleteClick = null,
onEditClick = {
onNavigateToEditTask(task)
},
onCancelClick = null,
onUncancelClick = null
)
}
}
}
// Cancelled tasks section
if (taskData.cancelledTasks.isNotEmpty()) {
item {
@@ -449,6 +501,7 @@ fun ResidenceDetailScreen(
Row(
modifier = Modifier
.fillMaxWidth()
.clickable { showCancelledTasks = !showCancelledTasks }
.padding(vertical = 8.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
@@ -468,9 +521,11 @@ fun ResidenceDetailScreen(
color = MaterialTheme.colorScheme.error
)
}
TextButton(onClick = { showCancelledTasks = !showCancelledTasks }) {
Text(if (showCancelledTasks) "Hide" else "Show")
}
Icon(
if (showCancelledTasks) Icons.Default.KeyboardArrowUp else Icons.Default.KeyboardArrowDown,
contentDescription = null,
tint = MaterialTheme.colorScheme.onSurfaceVariant
)
}
}