Skip to content

Commit 5dd572c

Browse files
Merge pull request #15934 from nextcloud/feat/chat-ui
feat: chat ui
2 parents 028fdfe + a37a94a commit 5dd572c

38 files changed

+1631
-587
lines changed

.idea/inspectionProfiles/ktlint.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ dependencies {
355355
implementation(libs.compose.ui.graphics)
356356
implementation(libs.compose.material3)
357357
implementation(libs.compose.ui.tooling.preview)
358+
implementation(libs.foundation)
358359
debugImplementation(libs.compose.ui.tooling)
359360
// endregion
360361

app/src/androidTest/java/com/nextcloud/client/assistant/AssistantRepositoryTests.kt

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.nextcloud.client.assistant.repository.remote.AssistantRemoteRepositor
1111
import com.owncloud.android.AbstractOnServerIT
1212
import com.owncloud.android.lib.resources.assistant.v2.model.TaskTypeData
1313
import com.owncloud.android.lib.resources.status.NextcloudVersion
14+
import kotlinx.coroutines.runBlocking
1415
import org.junit.Assert.assertTrue
1516
import org.junit.Before
1617
import org.junit.Test
@@ -33,8 +34,10 @@ class AssistantRepositoryTests : AbstractOnServerIT() {
3334
return
3435
}
3536

36-
val result = sut?.getTaskTypes()
37-
assertTrue(result?.isNotEmpty() == true)
37+
runBlocking {
38+
val result = sut?.getTaskTypes()
39+
assertTrue(result?.isNotEmpty() == true)
40+
}
3841
}
3942

4043
@Test
@@ -45,8 +48,10 @@ class AssistantRepositoryTests : AbstractOnServerIT() {
4548
return
4649
}
4750

48-
val result = sut?.getTaskList("assistant")
49-
assertTrue(result?.isEmpty() == true || (result?.size ?: 0) > 0)
51+
runBlocking {
52+
val result = sut?.getTaskList("assistant")
53+
assertTrue(result?.isEmpty() == true || (result?.size ?: 0) > 0)
54+
}
5055
}
5156

5257
@Test
@@ -65,8 +70,11 @@ class AssistantRepositoryTests : AbstractOnServerIT() {
6570
emptyMap(),
6671
emptyMap()
6772
)
68-
val result = sut?.createTask(input, taskType)
69-
assertTrue(result?.isSuccess == true)
73+
74+
runBlocking {
75+
val result = sut?.createTask(input, taskType)
76+
assertTrue(result?.isSuccess == true)
77+
}
7078
}
7179

7280
@Test
@@ -81,14 +89,16 @@ class AssistantRepositoryTests : AbstractOnServerIT() {
8189

8290
sleep(120)
8391

84-
val taskList = sut?.getTaskList("assistant")
85-
assertTrue(taskList != null)
92+
runBlocking {
93+
val taskList = sut?.getTaskList("assistant")
94+
assertTrue(taskList != null)
8695

87-
sleep(120)
96+
sleep(120)
8897

89-
assert((taskList?.size ?: 0) > 0)
98+
assert((taskList?.size ?: 0) > 0)
9099

91-
val result = sut?.deleteTask(taskList!!.first().id)
92-
assertTrue(result?.isSuccess == true)
100+
val result = sut?.deleteTask(taskList!!.first().id)
101+
assertTrue(result?.isSuccess == true)
102+
}
93103
}
94104
}

0 commit comments

Comments
 (0)