Skip to content

Commit b959eb8

Browse files
committed
handle task select
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent f158729 commit b959eb8

6 files changed

Lines changed: 24 additions & 5 deletions

File tree

app/src/main/java/com/nextcloud/client/assistant/AssistantScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ private fun InputBar(sessionId: Long?, selectedTaskType: TaskTypeData?, viewMode
319319
} else {
320320
if (taskType.isTranslate()) {
321321
// TODO:
322-
viewModel.translate()
322+
// viewModel.translate()
323323
} else {
324324
viewModel.createTask(input = text, taskType = taskType)
325325
}

app/src/main/java/com/nextcloud/client/assistant/AssistantViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class AssistantViewModel(
178178
) { selectedTask, selectedTaskType, chats, tasks ->
179179
val isChat = selectedTaskType?.isChat() == true
180180
val isTranslation =
181-
selectedTaskType?.isTranslate() == true && selectedTask?.type == "core:text2text:translate"
181+
selectedTaskType?.isTranslate() == true && selectedTask?.isTranslate() == true
182182

183183
when {
184184
selectedTaskType == null -> AssistantScreenState.Loading
@@ -369,7 +369,7 @@ class AssistantViewModel(
369369
}
370370
}
371371

372-
fun selectTask(task: Task) {
372+
fun selectTask(task: Task?) {
373373
_selectedTask.update {
374374
task
375375
}

app/src/main/java/com/nextcloud/client/assistant/task/TaskView.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fun TaskView(task: Task, viewModel: AssistantViewModel, capability: OCCapability
6363
.clickable {
6464
viewModel.selectTask(task)
6565

66-
if (task.type == "core:text2text:translate") {
66+
if (task.isTranslate()) {
6767
viewModel.updateScreenState(AssistantScreenState.Translation(task))
6868
} else {
6969
showTaskDetailBottomSheet = true
@@ -110,6 +110,8 @@ fun TaskView(task: Task, viewModel: AssistantViewModel, capability: OCCapability
110110
showTaskDetailBottomSheet = false
111111
showTaskActions()
112112
}) {
113+
// task is unselected
114+
viewModel.selectTask(null)
113115
showTaskDetailBottomSheet = false
114116
}
115117
}

app/src/main/java/com/nextcloud/client/assistant/translate/TranslationScreen.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import androidx.compose.material3.Text
3030
import androidx.compose.material3.TextField
3131
import androidx.compose.material3.TextFieldDefaults
3232
import androidx.compose.runtime.Composable
33+
import androidx.compose.runtime.DisposableEffect
3334
import androidx.compose.runtime.getValue
3435
import androidx.compose.runtime.mutableStateOf
3536
import androidx.compose.runtime.remember
@@ -67,9 +68,17 @@ fun TranslationScreen(selectedTaskType: TaskTypeData?, viewModel: AssistantViewM
6768
}
6869

6970
BackHandler {
71+
viewModel.selectTask(null)
7072
viewModel.updateScreenState(AssistantScreenState.TaskContent)
7173
}
7274

75+
// task is unselected
76+
DisposableEffect(Unit) {
77+
onDispose {
78+
viewModel.selectTask(null)
79+
}
80+
}
81+
7382
Scaffold(
7483
modifier = Modifier
7584
.fillMaxSize()

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
androidCommonLibraryVersion = "4fc0f29981"
66
androidGifDrawableVersion = "1.2.30"
77
androidImageCropperVersion = "4.7.0"
8-
androidLibraryVersion ="2f39f7613f"
8+
androidLibraryVersion ="ed2dd2b473"
99
androidPluginVersion = "9.0.0"
1010
androidsvgVersion = "1.4"
1111
androidxMediaVersion = "1.5.1"

gradle/verification-metadata.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20465,6 +20465,14 @@
2046520465
<sha256 value="d3e8ceaf80806f27eaaab354ccee5eccacd40b7507c22055290e56d59e53bd86" origin="Generated by Gradle" reason="Artifact is not signed"/>
2046620466
</artifact>
2046720467
</component>
20468+
<component group="com.github.nextcloud" name="android-library" version="ed2dd2b473">
20469+
<artifact name="android-library-ed2dd2b473.aar">
20470+
<sha256 value="09be44c4379291749f5b30d9a533be2446f570e9a682b9fcfa24497d6861da0e" origin="Generated by Gradle" reason="Artifact is not signed"/>
20471+
</artifact>
20472+
<artifact name="android-library-ed2dd2b473.module">
20473+
<sha256 value="801b74bb3d48c30b5b80defdd384bc9e598ee6a0fc328a82cfc54c7b54a80c81" origin="Generated by Gradle" reason="Artifact is not signed"/>
20474+
</artifact>
20475+
</component>
2046820476
<component group="com.github.nextcloud" name="android-library" version="ee61d15077aab61cf3bc996f14c871c4ff8ea674">
2046920477
<artifact name="android-library-ee61d15077aab61cf3bc996f14c871c4ff8ea674.aar">
2047020478
<sha256 value="dc7c01113fc8333aa61ead05bc5058f65857f9d57448b7328f26db24922b6662" origin="Generated by Gradle" reason="Artifact is not signed"/>

0 commit comments

Comments
 (0)