diff --git a/app/src/androidTest/java/com/nextcloud/client/assistant/AssistantRepositoryTests.kt b/app/src/androidTest/java/com/nextcloud/client/assistant/AssistantRepositoryTests.kt index bbdae7ebb7c7..e7cb55f0d67d 100644 --- a/app/src/androidTest/java/com/nextcloud/client/assistant/AssistantRepositoryTests.kt +++ b/app/src/androidTest/java/com/nextcloud/client/assistant/AssistantRepositoryTests.kt @@ -62,8 +62,8 @@ class AssistantRepositoryTests : AbstractOnServerIT() { "core:text2text", "Free text to text prompt", "Runs an arbitrary prompt through a language model that returns a reply", - null, - null + emptyMap(), + emptyMap() ) val result = sut?.createTask(input, taskType) assertTrue(result?.isSuccess == true) diff --git a/app/src/main/java/com/nextcloud/client/assistant/component/AddTaskAlertDialog.kt b/app/src/main/java/com/nextcloud/client/assistant/component/AddTaskAlertDialog.kt index d6a4aa2dcedb..e9ccbb4b3c6d 100644 --- a/app/src/main/java/com/nextcloud/client/assistant/component/AddTaskAlertDialog.kt +++ b/app/src/main/java/com/nextcloud/client/assistant/component/AddTaskAlertDialog.kt @@ -23,7 +23,7 @@ import com.owncloud.android.R @Composable fun AddTaskAlertDialog( - title: String?, + title: String, description: String?, defaultInput: String = "", addTask: (String) -> Unit, @@ -34,7 +34,7 @@ fun AddTaskAlertDialog( } SimpleAlertDialog( - title = title ?: "", + title = title, description = description ?: "", dismiss = { dismiss() }, onComplete = { diff --git a/app/src/main/java/com/nextcloud/client/assistant/model/ScreenOverlayState.kt b/app/src/main/java/com/nextcloud/client/assistant/model/ScreenOverlayState.kt index ab8d328e74e3..00f270a6eb65 100644 --- a/app/src/main/java/com/nextcloud/client/assistant/model/ScreenOverlayState.kt +++ b/app/src/main/java/com/nextcloud/client/assistant/model/ScreenOverlayState.kt @@ -50,8 +50,8 @@ sealed class ScreenOverlayState { task.type, activity.getString(R.string.assistant_screen_add_task_alert_dialog_title), null, - null, - null + emptyMap(), + emptyMap() ) val newState = AddTask(taskType, getInput() ?: "") onComplete(newState) diff --git a/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantMockRepository.kt b/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantMockRepository.kt index a7fe1c3fb7cf..59ad7a142ae6 100644 --- a/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantMockRepository.kt +++ b/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantMockRepository.kt @@ -12,9 +12,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.resources.assistant.v2.model.Shape import com.owncloud.android.lib.resources.assistant.v2.model.Task import com.owncloud.android.lib.resources.assistant.v2.model.TaskInput -import com.owncloud.android.lib.resources.assistant.v2.model.TaskInputShape import com.owncloud.android.lib.resources.assistant.v2.model.TaskOutput -import com.owncloud.android.lib.resources.assistant.v2.model.TaskOutputShape import com.owncloud.android.lib.resources.assistant.v2.model.TaskTypeData @Suppress("MagicNumber") @@ -22,21 +20,21 @@ class AssistantMockRepository(private val giveEmptyTasks: Boolean = false) : Ass override fun getTaskTypes(): List { return listOf( TaskTypeData( - "core:text2text", - "Free text to text prompt", - "Runs an arbitrary prompt through a language model that returns a reply", - inputShape = TaskInputShape( - input = Shape( - "Prompt", - "Describe a task that you want the assistant to do or ask a question", - "Text" + id = "core:text2text", + name = "Free text to text prompt", + description = "Runs an arbitrary prompt through a language model that returns a reply", + inputShape = mapOf( + "input" to Shape( + name = "Prompt", + description = "Describe a task that you want the assistant to do or ask a question", + type = "Text" ) ), - outputShape = TaskOutputShape( - output = Shape( - "Generated reply", - "The generated text from the assistant", - "Text" + outputShape = mapOf( + "output" to Shape( + name = "Generated reply", + description = "The generated text from the assistant", + type = "Text" ) ) ) diff --git a/app/src/main/java/com/nextcloud/client/assistant/taskTypes/TaskTypesRow.kt b/app/src/main/java/com/nextcloud/client/assistant/taskTypes/TaskTypesRow.kt index a9596819afbc..fa99d737623f 100644 --- a/app/src/main/java/com/nextcloud/client/assistant/taskTypes/TaskTypesRow.kt +++ b/app/src/main/java/com/nextcloud/client/assistant/taskTypes/TaskTypesRow.kt @@ -38,13 +38,13 @@ fun TaskTypesRow(selectedTaskType: TaskTypeData?, data: List, sele } ) { data.forEach { taskType -> - taskType.name?.let { taskTypeName -> + if (taskType.name.isNotEmpty()) { Tab( selected = selectedTaskType?.id == taskType.id, onClick = { selectTaskType(taskType) }, selectedContentColor = colorResource(R.color.text_color), unselectedContentColor = colorResource(R.color.disabled_text), - text = { Text(text = taskTypeName) } + text = { Text(text = taskType.name) } ) } } @@ -54,12 +54,12 @@ fun TaskTypesRow(selectedTaskType: TaskTypeData?, data: List, sele @Composable @Preview private fun TaskTypesRowPreview() { - val selectedTaskType = TaskTypeData("1", "Free text to text prompt", "", null, null) + val selectedTaskType = TaskTypeData("1", "Free text to text prompt", "", emptyMap(), emptyMap()) val taskTypes = listOf( - TaskTypeData("1", "Free text to text prompt", "", null, null), - TaskTypeData("2", "Extract topics", "", null, null), - TaskTypeData("3", "Generate Headline", "", null, null), - TaskTypeData("4", "Summarize", "", null, null) + TaskTypeData("1", "Free text to text prompt", "", emptyMap(), emptyMap()), + TaskTypeData("2", "Extract topics", "", emptyMap(), emptyMap()), + TaskTypeData("3", "Generate Headline", "", emptyMap(), emptyMap()), + TaskTypeData("4", "Summarize", "", emptyMap(), emptyMap()) ) TaskTypesRow(selectedTaskType, taskTypes) { } diff --git a/build.gradle b/build.gradle index 0f8cbc1f8a41..4f8925b81679 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ */ buildscript { ext { - androidLibraryVersion ="8c14b444c709e91462fd503af87608a7fa40e90b" + androidLibraryVersion ="0edf15760b8a086ab9969e103c7229dad973efbd" androidCommonLibraryVersion = "0.26.0" androidPluginVersion = "8.9.2" androidxMediaVersion = "1.5.1" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 3ed46a367429..3c5a22996922 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4835,7 +4835,7 @@ - + @@ -12309,6 +12309,14 @@ + + + + + + + + @@ -12637,6 +12645,14 @@ + + + + + + + + @@ -12765,6 +12781,14 @@ + + + + + + + +