diff --git a/qqq/android/core/src/main/java/com/kingsrook/qqq/frontend/android/core/model/metadata/QHelpContent.kt b/qqq/android/core/src/main/java/com/kingsrook/qqq/frontend/android/core/model/metadata/QHelpContent.kt index 9a4f39e..f38d6ef 100644 --- a/qqq/android/core/src/main/java/com/kingsrook/qqq/frontend/android/core/model/metadata/QHelpContent.kt +++ b/qqq/android/core/src/main/java/com/kingsrook/qqq/frontend/android/core/model/metadata/QHelpContent.kt @@ -27,8 +27,9 @@ import kotlinx.serialization.Serializable *******************************************************************************/ @Serializable data class QHelpContent( - val content: String, - val format: String, + val content: String? = null, // QQQ core now sends summary-only help entries + val summary: String? = null, + val format: String? = null, val roles: Set = emptySet(), val contentAsText: String? = null ) { diff --git a/qqq/android/core/src/main/java/com/kingsrook/qqq/frontend/android/core/model/metadata/QWidgetMetaData.kt b/qqq/android/core/src/main/java/com/kingsrook/qqq/frontend/android/core/model/metadata/QWidgetMetaData.kt index 1af3d74..e4245c2 100644 --- a/qqq/android/core/src/main/java/com/kingsrook/qqq/frontend/android/core/model/metadata/QWidgetMetaData.kt +++ b/qqq/android/core/src/main/java/com/kingsrook/qqq/frontend/android/core/model/metadata/QWidgetMetaData.kt @@ -23,6 +23,7 @@ package com.kingsrook.qqq.frontend.android.core.model.metadata import kotlinx.serialization.Serializable +import kotlinx.serialization.json.JsonElement /******************************************************************************* *******************************************************************************/ @@ -30,7 +31,7 @@ import kotlinx.serialization.Serializable data class QWidgetMetaData( val name: String, val label: String? = null, - val icon: QIcon? = null, + val icon: JsonElement? = null, // QQQ core serializes a widget icon as a plain string (e.g. "troubleshoot"); tolerate an object too val type: String, ) { } diff --git a/qqq/android/mobileapp/src/main/java/com/kingsrook/qqq/frontend/android/mobileapp/ui/processes/components/ProcessComponentEditForm.kt b/qqq/android/mobileapp/src/main/java/com/kingsrook/qqq/frontend/android/mobileapp/ui/processes/components/ProcessComponentEditForm.kt index 0b93739..f013b3b 100644 --- a/qqq/android/mobileapp/src/main/java/com/kingsrook/qqq/frontend/android/mobileapp/ui/processes/components/ProcessComponentEditForm.kt +++ b/qqq/android/mobileapp/src/main/java/com/kingsrook/qqq/frontend/android/mobileapp/ui/processes/components/ProcessComponentEditForm.kt @@ -128,7 +128,7 @@ fun ProcessComponentEditForm(processViewModel: ProcessViewModel, component: QFro OutlinedButton(onClick = { processViewModel.loadRemoteOptions(field) }) { Text("Retry choices") } } semanticFieldHint(field)?.let { Text(it) } - field.helpContents.orEmpty().forEach { Text(it.contentAsText ?: plainText(it.content)) } + field.helpContents.orEmpty().forEach { Text(it.contentAsText ?: it.content?.let { c -> plainText(c) } ?: it.summary.orEmpty()) } } } }