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-08 16:02:01 -06:00
parent 97eed0eee9
commit 7dce211681
17 changed files with 1757 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composeApp/src/commonMain/kotlin/com/example/mycrib/App.kt
View File

@@ -423,7 +423,7 @@ fun App() {
description = route.description,
category = TaskCategory(route.categoryId, route.categoryName),
frequency = TaskFrequency(
route.frequencyId, route.frequencyName, "",
route.frequencyId, route.frequencyName, "", route.frequencyName,
daySpan = 0,
notifyDays = 0
),

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

@@ -14,7 +14,7 @@ data class CustomTask (
val category: String,
val priority: String,
val status: String? = null,
@SerialName("due_date") val dueDate: String,
@SerialName("due_date") val dueDate: String?,
@SerialName("estimated_cost") val estimatedCost: String? = null,
@SerialName("actual_cost") val actualCost: String? = null,
val notes: String? = null,
@@ -62,7 +62,7 @@ data class TaskDetail(
val priority: TaskPriority,
val frequency: TaskFrequency,
val status: TaskStatus?,
@SerialName("due_date") val dueDate: String,
@SerialName("due_date") val dueDate: String?,
@SerialName("estimated_cost") val estimatedCost: String? = null,
@SerialName("actual_cost") val actualCost: String? = null,
val notes: String? = null,

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

@@ -26,6 +26,7 @@ data class TaskFrequencyResponse(
data class TaskFrequency(
val id: Int,
val name: String,
@SerialName("lookup_name") val lookupName: String,
@SerialName("display_name") val displayName: String,
@SerialName("day_span") val daySpan: Int? = null,
@SerialName("notify_days") val notifyDays: Int? = null

2
composeApp/src/commonMain/kotlin/com/example/mycrib/navigation/Routes.kt
View File

@@ -62,7 +62,7 @@ data class EditTaskRoute(
val priorityName: String,
val statusId: Int?,
val statusName: String?,
val dueDate: String,
val dueDate: String?,
val estimatedCost: String?,
val createdAt: String,
val updatedAt: String

2
composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/AddNewTaskDialog.kt
View File

@@ -31,7 +31,7 @@ fun AddNewTaskDialog(
var category by remember { mutableStateOf(TaskCategory(id = 0, name = "")) }
var frequency by remember { mutableStateOf(TaskFrequency(
id = 0, name = "", displayName = "",
id = 0, name = "", lookupName = "", displayName = "",
daySpan = 0,
notifyDays = 0
)) }

2
composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/AddNewTaskWithResidenceDialog.kt
View File

@@ -34,7 +34,7 @@ fun AddNewTaskWithResidenceDialog(
var selectedResidenceId by remember { mutableStateOf(residencesResponse.residences.firstOrNull()?.id ?: 0) }
var category by remember { mutableStateOf(TaskCategory(id = 0, name = "")) }
var frequency by remember { mutableStateOf(TaskFrequency(
id = 0, name = "", displayName = "",
id = 0, name = "", lookupName = "", displayName = "",
daySpan = 0,
notifyDays = 0
)) }

4
composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/task/TaskCard.kt
View File

@@ -127,7 +127,7 @@ fun TaskCard(
)
Spacer(modifier = Modifier.width(4.dp))
Text(
text = task.nextScheduledDate ?: task.dueDate,
text = task.nextScheduledDate ?: task.dueDate ?: "N/A",
style = MaterialTheme.typography.bodySmall,
fontWeight = FontWeight.SemiBold
)
@@ -345,7 +345,7 @@ fun TaskCardPreview() {
category = TaskCategory(id = 1, name = "maintenance", description = ""),
priority = TaskPriority(id = 2, name = "medium", displayName = "Medium", description = ""),
frequency = TaskFrequency(
id = 1, name = "monthly", displayName = "Monthly",
id = 1, name = "monthly", lookupName = "monthly", displayName = "Monthly",
daySpan = 0,
notifyDays = 0
),

4
composeApp/src/commonMain/kotlin/com/example/mycrib/ui/screens/EditTaskScreen.kt
View File

@@ -31,7 +31,7 @@ fun EditTaskScreen(
var selectedFrequency by remember { mutableStateOf<TaskFrequency?>(task.frequency) }
var selectedPriority by remember { mutableStateOf<TaskPriority?>(task.priority) }
var selectedStatus by remember { mutableStateOf<TaskStatus?>(task.status) }
var dueDate by remember { mutableStateOf(task.dueDate) }
var dueDate by remember { mutableStateOf(task.dueDate ?: "") }
var estimatedCost by remember { mutableStateOf(task.estimatedCost ?: "") }
var categoryExpanded by remember { mutableStateOf(false) }
@@ -70,7 +70,7 @@ fun EditTaskScreen(
titleError = ""
}
if (dueDate.isBlank()) {
if (dueDate.isNullOrBlank()) {
dueDateError = "Due date is required"
isValid = false
} else {