Skip to content

Commit f158729

Browse files
committed
fix layout update
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 32da238 commit f158729

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ fun AssistantScreen(
192192
}
193193
},
194194
bottomBar = {
195-
if (!taskTypes.isNullOrEmpty() && selectedTaskType?.isTranslate() == false) {
195+
if (!taskTypes.isNullOrEmpty()) {
196196
InputBar(
197197
sessionId,
198198
selectedTaskType,
@@ -317,7 +317,12 @@ private fun InputBar(sessionId: Long?, selectedTaskType: TaskTypeData?, viewMode
317317
viewModel.createConversation(text)
318318
}
319319
} else {
320-
viewModel.createTask(input = text, taskType = taskType)
320+
if (taskType.isTranslate()) {
321+
// TODO:
322+
viewModel.translate()
323+
} else {
324+
viewModel.createTask(input = text, taskType = taskType)
325+
}
321326
}
322327

323328
scope.launch {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import androidx.compose.ui.Modifier
3939
import androidx.compose.ui.graphics.Color
4040
import androidx.compose.ui.res.painterResource
4141
import androidx.compose.ui.res.stringResource
42+
import androidx.compose.ui.unit.Dp
4243
import androidx.compose.ui.unit.dp
4344
import com.nextcloud.client.assistant.AssistantViewModel
4445
import com.nextcloud.client.assistant.model.AssistantScreenState
@@ -76,6 +77,7 @@ fun TranslationScreen(selectedTaskType: TaskTypeData?, viewModel: AssistantViewM
7677
.padding(top = 32.dp),
7778
floatingActionButton = {
7879
FloatingActionButton(onClick = {
80+
// TODO:
7981
val originLang = sourceState.language
8082
val targetLang = targetState.language
8183
if (originLang != null && targetLang != null) {
@@ -93,6 +95,7 @@ fun TranslationScreen(selectedTaskType: TaskTypeData?, viewModel: AssistantViewM
9395
hintId = R.string.translation_screen_hint_source,
9496
state = sourceState,
9597
availableLanguages = languages?.originLanguages ?: emptyList(),
98+
maxDp = 120.dp,
9699
onStateChange = { sourceState = it }
97100
)
98101
}
@@ -111,6 +114,7 @@ fun TranslationScreen(selectedTaskType: TaskTypeData?, viewModel: AssistantViewM
111114
hintId = R.string.translation_screen_hint_target,
112115
state = targetState,
113116
availableLanguages = languages?.targetLanguages ?: emptyList(),
117+
maxDp = Dp.Unspecified,
114118
onStateChange = { targetState = it }
115119
)
116120
}
@@ -124,6 +128,7 @@ private fun TranslationSection(
124128
hintId: Int,
125129
state: TranslationSideState,
126130
availableLanguages: List<TranslationLanguage>,
131+
maxDp: Dp,
127132
onStateChange: (TranslationSideState) -> Unit
128133
) {
129134
Row(
@@ -171,7 +176,7 @@ private fun TranslationSection(
171176
onValueChange = { onStateChange(state.copy(text = it)) },
172177
modifier = Modifier
173178
.fillMaxWidth()
174-
.heightIn(min = 120.dp, max = 240.dp),
179+
.heightIn(min = 120.dp, max = maxDp),
175180
placeholder = {
176181
Text(text = stringResource(hintId), style = MaterialTheme.typography.headlineSmall)
177182
},

0 commit comments

Comments
 (0)