diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Document.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Document.kt index 633a5a1..c1f88c7 100644 --- a/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Document.kt +++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Document.kt @@ -80,8 +80,9 @@ data class DocumentCreateRequest( @SerialName("start_date") val startDate: String? = null, @SerialName("end_date") val endDate: String? = null, // Relationships - val residence: Int, - val contractor: Int? = null, + @SerialName("residence_id") val residenceId: Int, + @SerialName("contractor_id") val contractorId: Int? = null, + @SerialName("task_id") val taskId: Int? = null, // Images @SerialName("image_urls") val imageUrls: List? = null, // Metadata @@ -110,7 +111,7 @@ data class DocumentUpdateRequest( @SerialName("start_date") val startDate: String? = null, @SerialName("end_date") val endDate: String? = null, // Relationships - val contractor: Int? = null, + @SerialName("contractor_id") val contractorId: Int? = null, // Metadata val tags: String? = null, val notes: String? = null, diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/DocumentApi.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/DocumentApi.kt index 5fa13d6..c026c33 100644 --- a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/DocumentApi.kt +++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/DocumentApi.kt @@ -102,12 +102,12 @@ class DocumentApi(private val client: HttpClient = ApiClient.httpClient) { formData = formData { append("title", title) append("document_type", documentType) - append("residence", residenceId.toString()) + append("residence_id", residenceId.toString()) description?.let { append("description", it) } category?.let { append("category", it) } tags?.let { append("tags", it) } notes?.let { append("notes", it) } - contractorId?.let { append("contractor", it.toString()) } + contractorId?.let { append("contractor_id", it.toString()) } append("is_active", isActive.toString()) // Warranty fields itemName?.let { append("item_name", it) } @@ -159,8 +159,8 @@ class DocumentApi(private val client: HttpClient = ApiClient.httpClient) { purchaseDate = purchaseDate, startDate = startDate, endDate = endDate, - residence = residenceId, - contractor = contractorId, + residenceId = residenceId, + contractorId = contractorId, tags = tags, notes = notes, isActive = isActive @@ -227,7 +227,7 @@ class DocumentApi(private val client: HttpClient = ApiClient.httpClient) { category?.let { append("category", it) } tags?.let { append("tags", it) } notes?.let { append("notes", it) } - contractorId?.let { append("contractor", it.toString()) } + contractorId?.let { append("contractor_id", it.toString()) } isActive?.let { append("is_active", it.toString()) } // Warranty fields itemName?.let { append("item_name", it) } @@ -268,7 +268,7 @@ class DocumentApi(private val client: HttpClient = ApiClient.httpClient) { purchaseDate = purchaseDate, startDate = startDate, endDate = endDate, - contractor = contractorId, + contractorId = contractorId, tags = tags, notes = notes, isActive = isActive diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json index 3cad146..7bebbf3 100644 --- a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "logo_primary.png", + "filename" : "mycrib-icon@2x.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/logo_primary.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/logo_primary.png deleted file mode 100644 index 8c0231e..0000000 Binary files a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/logo_primary.png and /dev/null differ diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/mycrib-icon@2x.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/mycrib-icon@2x.png new file mode 100644 index 0000000..d331dc9 Binary files /dev/null and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/mycrib-icon@2x.png differ