From cf5cd95f956c4c74f3fe69d673539af4a9073122 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Tue, 1 Jul 2025 13:59:40 +0200 Subject: [PATCH 1/7] update lib Signed-off-by: alperozturk --- .../repository/AssistantMockRepository.kt | 28 +++++++++---------- gradle/verification-metadata.xml | 10 ++++++- 2 files changed, 22 insertions(+), 16 deletions(-) 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/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index d3136cae99b4..55f977a4bb2f 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4498,7 +4498,7 @@ - + @@ -12404,6 +12404,14 @@ + + + + + + + + From 8d5c4585fcf1b6d1aeedfe7449f7e08bef3914ea Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 2 Jul 2025 11:09:21 +0200 Subject: [PATCH 2/7] check emptiness instead of nullability Signed-off-by: alperozturk --- .../assistant/component/AddTaskAlertDialog.kt | 4 ++-- .../client/assistant/model/ScreenOverlayState.kt | 4 ++-- .../client/assistant/taskTypes/TaskTypesRow.kt | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) 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/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) { } From 1128c3f7d595245ab74c121e95b47b0393506b00 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 2 Jul 2025 12:03:05 +0200 Subject: [PATCH 3/7] update lib Signed-off-by: alperozturk --- gradle/verification-metadata.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 55f977a4bb2f..bc169904fde4 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -12276,6 +12276,14 @@ + + + + + + + + From 76a2d9015036e5d086ed4218510c47208c6d2b55 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 2 Jul 2025 13:14:14 +0200 Subject: [PATCH 4/7] fix tests Signed-off-by: alperozturk --- .../nextcloud/client/assistant/AssistantRepositoryTests.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) From 4b79d7d9f05e1e0373b868db8e9ac1fef4da31a6 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 2 Jul 2025 14:11:39 +0200 Subject: [PATCH 5/7] update libs Signed-off-by: alperozturk [skip ci] --- gradle/verification-metadata.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index bc169904fde4..efdd00ed5815 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -11956,6 +11956,14 @@ + + + + + + + + From 5cd634150c840cfddb1609126a5df753fdf84599 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 2 Jul 2025 15:07:33 +0200 Subject: [PATCH 6/7] update androidLibraryVersion Signed-off-by: alperozturk --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f54cd92753cb..b30f607efa3f 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ */ buildscript { ext { - androidLibraryVersion ="ffc47c75fabbcbcdcd32b30e9836fde58d5c59d5" + androidLibraryVersion ="0edf15760b8a086ab9969e103c7229dad973efbd" androidCommonLibraryVersion = "0.26.0" androidPluginVersion = "8.9.2" androidxMediaVersion = "1.5.1" From 54a5c6e9dd07e2acc824a4be4308f51cffcbbebc Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 2 Jul 2025 15:23:09 +0200 Subject: [PATCH 7/7] use 2.21.0 android lib Signed-off-by: alperozturk --- build.gradle | 2 +- gradle/verification-metadata.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b30f607efa3f..4225fe1fbc7b 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ */ buildscript { ext { - androidLibraryVersion ="0edf15760b8a086ab9969e103c7229dad973efbd" + androidLibraryVersion ="0cd810113183e03e196347c537f01723f9950b44" 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 efdd00ed5815..cddb0cd8a0e6 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -11956,6 +11956,14 @@ + + + + + + + +