fix layout update

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

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

@@ -384,13 +384,11 @@ private fun TaskContent(
         items(taskList, key = { it.id }) { task ->
             TaskView(
                 task,
+                viewModel,
                 capability,
                 showTaskActions = {
                     val newState = ScreenOverlayState.TaskActions(task)
                     viewModel.updateScreenOverlayState(newState)
-                },
-                showTranslateScreen = {
-                    viewModel.updateScreenState(AssistantScreenState.Translation(it))
                 }
             )
             Spacer(modifier = Modifier.height(8.dp))
@@ -485,7 +483,7 @@ private fun getMockConversationViewModel(): ConversationViewModel {
     )
 }
 
-private fun getMockAssistantViewModel(giveEmptyTasks: Boolean): AssistantViewModel {
+fun getMockAssistantViewModel(giveEmptyTasks: Boolean): AssistantViewModel {
     val mockLocalRepository = MockAssistantLocalRepository()
     val mockRemoteRepository = MockAssistantRemoteRepository(giveEmptyTasks)
     return AssistantViewModel(

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

@@ -63,6 +63,9 @@ class AssistantViewModel(
     private val _snackbarMessageId = MutableStateFlow<Int?>(null)
     val snackbarMessageId: StateFlow<Int?> = _snackbarMessageId
 
+    private val _selectedTask = MutableStateFlow<Task?>(null)
+    val selectedTask: StateFlow<Task?> = _selectedTask
+
     private val _selectedTaskType = MutableStateFlow<TaskTypeData?>(null)
     val selectedTaskType: StateFlow<TaskTypeData?> = _selectedTaskType
 
@@ -168,14 +171,18 @@ class AssistantViewModel(
     private fun observeScreenState() {
         viewModelScope.launch {
             combine(
+                _selectedTask,
                 _selectedTaskType,
                 _chatMessages,
                 _filteredTaskList
-            ) { selectedTask, chats, tasks ->
-                val isChat = selectedTask?.isChat() == true
+            ) { selectedTask, selectedTaskType, chats, tasks ->
+                val isChat = selectedTaskType?.isChat() == true
+                val isTranslation =
+                    selectedTaskType?.isTranslate() == true && selectedTask?.type == "core:text2text:translate"
 
                 when {
-                    selectedTask == null -> AssistantScreenState.Loading
+                    selectedTaskType == null -> AssistantScreenState.Loading
+                    isTranslation -> AssistantScreenState.Translation(selectedTask)
                     isChat && chats.isEmpty() -> AssistantScreenState.emptyChatList()
                     isChat -> AssistantScreenState.ChatContent
                     !isChat && (tasks == null || tasks.isEmpty()) -> AssistantScreenState.emptyTaskList()
@@ -362,6 +369,12 @@ class AssistantViewModel(
         }
     }
 
+    fun selectTask(task: Task) {
+        _selectedTask.update {
+            task
+        }
+    }
+
     fun updateSnackbarMessage(value: Int?) {
         _snackbarMessageId.update {
             value

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

@@ -38,6 +38,9 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.nextcloud.client.assistant.AssistantViewModel
+import com.nextcloud.client.assistant.getMockAssistantViewModel
+import com.nextcloud.client.assistant.model.AssistantScreenState
 import com.nextcloud.client.assistant.taskDetail.TaskDetailBottomSheet
 import com.nextcloud.utils.extensions.truncateWithEllipsis
 import com.owncloud.android.R
@@ -48,7 +51,7 @@ import com.owncloud.android.lib.resources.status.OCCapability
 
 @Suppress("LongMethod", "MagicNumber")
 @Composable
-fun TaskView(task: Task, capability: OCCapability, showTaskActions: () -> Unit, showTranslateScreen: (Task) -> Unit) {
+fun TaskView(task: Task, viewModel: AssistantViewModel, capability: OCCapability, showTaskActions: () -> Unit) {
     var showTaskDetailBottomSheet by remember { mutableStateOf(false) }
 
     Box {
@@ -58,8 +61,10 @@ fun TaskView(task: Task, capability: OCCapability, showTaskActions: () -> Unit,
                 .clip(RoundedCornerShape(8.dp))
                 .background(color = colorResource(R.color.task_container))
                 .clickable {
+                    viewModel.selectTask(task)
+
                     if (task.type == "core:text2text:translate") {
-                        showTranslateScreen(task)
+                        viewModel.updateScreenState(AssistantScreenState.Translation(task))
                     } else {
                         showTaskDetailBottomSheet = true
                     }
@@ -145,12 +150,11 @@ private fun TaskViewPreview() {
             1707692337,
             1707692337
         ),
+        viewModel = getMockAssistantViewModel(true),
         OCCapability().apply {
             versionMayor = 30
         },
         showTaskActions = {
-        },
-        showTranslateScreen = {
         }
     )
 }

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

@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.DropdownMenu
@@ -33,6 +34,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
@@ -127,7 +129,8 @@ private fun TranslationSection(
     Row(
         modifier = Modifier
             .padding(16.dp)
-            .clickable { onStateChange(state.copy(isExpanded = !state.isExpanded)) }
+            .clickable { onStateChange(state.copy(isExpanded = !state.isExpanded)) },
+        verticalAlignment = Alignment.CenterVertically
     ) {
         Text(
             text = stringResource(labelId),
@@ -139,6 +142,14 @@ private fun TranslationSection(
             text = state.language?.name ?: "",
             style = MaterialTheme.typography.labelLarge
         )
+        Icon(
+            painter = painterResource(R.drawable.ic_baseline_arrow_drop_down_24),
+            contentDescription = "dropdown icon",
+            modifier = Modifier
+                .padding(start = 4.dp)
+                .size(16.dp),
+            tint = MaterialTheme.colorScheme.onSurfaceVariant
+        )
 
         DropdownMenu(
             expanded = state.isExpanded,

app/src/main/res/values/strings.xml

@@ -73,7 +73,7 @@
     <string name="assistant_screen_select_task">Please select task</string>
 
     <!-- Translation Screen -->
-    <string name="translation_screen_label_from">Source language: </string>
+    <string name="translation_screen_label_from">Translate from: </string>
     <string name="translation_screen_label_to">Translate to: </string>
     <string name="translation_screen_hint_source">Enter text to translate…</string>
     <string name="translation_screen_hint_target">Translation will appear here…</string>