Skip to content

Commit b763bec

Browse files
committed
dont allow user doesnt have chat ui feature to open conversation list
Signed-off-by: alperozturk <[email protected]>
1 parent 447a5f4 commit b763bec

File tree

4 files changed

+33
-6
lines changed

4 files changed

+33
-6
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ import com.nextcloud.client.assistant.taskTypes.TaskTypesRow
6969
import com.nextcloud.ui.composeActivity.ComposeActivity
7070
import com.nextcloud.ui.composeComponents.alertDialog.SimpleAlertDialog
7171
import com.nextcloud.ui.composeComponents.bottomSheet.MoreActionsBottomSheet
72+
import com.nextcloud.utils.extensions.getChat
7273
import com.owncloud.android.R
7374
import com.owncloud.android.lib.resources.assistant.v2.model.Task
7475
import com.owncloud.android.lib.resources.assistant.v2.model.TaskTypeData
@@ -122,7 +123,8 @@ fun AssistantScreen(
122123
}
123124

124125
HorizontalPager(
125-
state = pagerState
126+
state = pagerState,
127+
userScrollEnabled = taskTypes.getChat() != null
126128
) { page ->
127129
when (page) {
128130
0 -> {
@@ -132,7 +134,7 @@ fun AssistantScreen(
132134
}
133135
}, openChat = { newSessionId ->
134136
viewModel.initSessionId(newSessionId)
135-
taskTypes?.find { it.isChat() }?.let { chatTaskType ->
137+
taskTypes.getChat()?.let { chatTaskType ->
136138
viewModel.selectTaskType(chatTaskType)
137139
}
138140
scope.launch {
@@ -386,7 +388,7 @@ private fun EmptyContent(paddingValues: PaddingValues, iconId: Int?, description
386388
titleId?.let {
387389
Text(
388390
text = stringResource(titleId),
389-
fontSize = MaterialTheme.typography.headlineSmall.fontSize,
391+
style = MaterialTheme.typography.headlineSmall,
390392
textAlign = TextAlign.Center,
391393
color = colorResource(R.color.text_color)
392394
)
@@ -396,7 +398,7 @@ private fun EmptyContent(paddingValues: PaddingValues, iconId: Int?, description
396398
descriptionId?.let {
397399
Text(
398400
text = stringResource(descriptionId),
399-
fontSize = MaterialTheme.typography.bodyMedium.fontSize,
401+
style = MaterialTheme.typography.bodyMedium,
400402
textAlign = TextAlign.Center,
401403
color = colorResource(R.color.text_color)
402404
)

app/src/main/java/com/nextcloud/client/assistant/conversation/ConversationScreen.kt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.fillMaxSize
1919
import androidx.compose.foundation.layout.fillMaxWidth
2020
import androidx.compose.foundation.layout.height
2121
import androidx.compose.foundation.layout.padding
22+
import androidx.compose.foundation.layout.width
2223
import androidx.compose.foundation.lazy.LazyColumn
2324
import androidx.compose.foundation.lazy.items
2425
import androidx.compose.material.icons.Icons
@@ -48,6 +49,7 @@ import androidx.compose.ui.Modifier
4849
import androidx.compose.ui.platform.LocalContext
4950
import androidx.compose.ui.res.colorResource
5051
import androidx.compose.ui.res.stringResource
52+
import androidx.compose.ui.text.style.TextAlign
5153
import androidx.compose.ui.text.style.TextOverflow
5254
import androidx.compose.ui.tooling.preview.Preview
5355
import androidx.compose.ui.unit.dp
@@ -79,7 +81,7 @@ fun ConversationScreen(viewModel: ConversationViewModel, close: () -> Unit, open
7981

8082
Scaffold(
8183
topBar = {
82-
Row(modifier = Modifier.fillMaxWidth()) {
84+
Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
8385
IconButton(
8486
onClick = {
8587
close()
@@ -90,6 +92,12 @@ fun ConversationScreen(viewModel: ConversationViewModel, close: () -> Unit, open
9092
contentDescription = "go back to assistant page"
9193
)
9294
}
95+
Spacer(modifier = Modifier.width(8.dp))
96+
Text(
97+
text = stringResource(R.string.conversation_screen_title),
98+
textAlign = TextAlign.Center,
99+
style = MaterialTheme.typography.headlineSmall
100+
)
93101
Spacer(modifier = Modifier.weight(1f))
94102
}
95103
},
@@ -126,7 +134,11 @@ fun ConversationScreen(viewModel: ConversationViewModel, close: () -> Unit, open
126134
.padding(innerPadding),
127135
contentAlignment = Alignment.Center
128136
) {
129-
Text(stringResource(R.string.conversation_screen_empty_content_title))
137+
Text(
138+
stringResource(R.string.conversation_screen_empty_content_title),
139+
textAlign = TextAlign.Center,
140+
style = MaterialTheme.typography.headlineSmall
141+
)
130142
}
131143
}
132144

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
* Nextcloud - Android Client
3+
*
4+
* SPDX-FileCopyrightText: 2025 Alper Ozturk <[email protected]>
5+
* SPDX-License-Identifier: AGPL-3.0-or-later
6+
*/
7+
8+
package com.nextcloud.utils.extensions
9+
10+
import com.owncloud.android.lib.resources.assistant.v2.model.TaskTypeData
11+
12+
fun List<TaskTypeData>?.getChat(): TaskTypeData? = this?.find { it.isChat() }

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
<string name="assistant_task_detail_screen_output_button_title">Output</string>
7575

7676
<!-- Conversation Screen -->
77+
<string name="conversation_screen_title">Conversations</string>
7778
<string name="conversation_screen_empty_conversation_list_title">No conversations yet</string>
7879
<string name="conversation_screen_fetch_error_title">Failed to fetch conversation list</string>
7980
<string name="conversation_screen_empty_content_title">No conversations found</string>

0 commit comments

Comments
 (0)