Skip to content

Commit aa119ed

Browse files
committed
Merge branch 'develop'
2 parents e23a614 + 323973b commit aa119ed

File tree

20 files changed

+349
-52
lines changed

20 files changed

+349
-52
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155

156156
# Sets gradle up
157157
- name: Setup Gradle
158-
uses: gradle/gradle-build-action@v2
158+
uses: gradle/gradle-build-action@v2.7
159159

160160
# Cleans managed device if previously settle and space currently is not available
161161
- name: Clean Managed Devices

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ Video roadmap and changelog is available [here](https://github.com/GetStream/pro
107107
- [X] Livestream tutorial (depends on RTMP support) (Thierry)
108108
- [X] local version of audioLevel(s) for lower latency audio visualizations(Daniel)
109109
- [X] Complete integration with the video demo flow
110+
- [X] Pagination on query members & query call endpoints (Daniel)
110111
- [X] Enable ice restarts for publisher and subscriber
111112
- [X] Ringing: Finish it, make testing easy and write docs for common changes (Daniel)
112113

buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ object Configuration {
55
const val targetSdk = 33
66
const val minSdk = 24
77
const val majorVersion = 0
8-
const val minorVersion = 2
9-
const val patchVersion = 2
8+
const val minorVersion = 3
9+
const val patchVersion = 0
1010
const val versionName = "$majorVersion.$minorVersion.$patchVersion"
11-
const val versionCode = 4
12-
const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion}-SNAPSHOT"
11+
const val versionCode = 5
12+
const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
1313
const val artifactGroup = "io.getstream"
1414
}

development.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,4 +331,13 @@ Scenario 2 - Tests block:
331331
### Docs
332332

333333
Run this for a local preview of the docs:
334-
npx stream-chat-docusaurus -i -s
334+
npx stream-chat-docusaurus -i -s
335+
336+
### Release
337+
338+
You can release a new SDK version following the steps below:
339+
340+
1. Increase the [patch number](https://github.com/GetStream/stream-video-android/blob/develop/buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt#L9)
341+
2. Increase the [version code](https://github.com/GetStream/stream-video-android/blob/develop/buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt#L11) by 1
342+
3. Merge them into the `develop` and `main`
343+
4. [Release on GitHub](https://github.com/GetStream/stream-video-android/releases) with the new version name against the `main` branch. You should make sure the **target branch** is `main`.

docusaurus/docs/Android/02-tutorials/01-video-calling.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ If you're new to android, note that there are 2 `build.gradle` files, you want t
3131
```kotlin
3232
dependencies {
3333
// Stream Video Compose SDK
34-
implementation("io.getstream:stream-video-android-compose:0.2.2")
34+
implementation("io.getstream:stream-video-android-compose:0.3.0")
3535

3636
// Optionally add Jetpack Compose if Android studio didn't automatically include them
3737
implementation(platform("androidx.compose:compose-bom:2023.06.00"))

docusaurus/docs/Android/02-tutorials/02-audio-room.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If you're new to android, note that there are 2 `build.gradle` files, you want t
3535
```groovy
3636
dependencies {
3737
// Stream Video Compose SDK
38-
implementation("io.getstream:stream-video-android-compose:0.2.2")
38+
implementation("io.getstream:stream-video-android-compose:0.3.0")
3939
4040
// Jetpack Compose (optional/ android studio typically adds them when you create a new project)
4141
implementation(platform("androidx.compose:compose-bom:2023.06.00"))

docusaurus/docs/Android/02-tutorials/03-livestream.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If you're new to android, note that there are 2 `build.gradle` files, you want t
3535
```kotlin
3636
dependencies {
3737
// Stream Video Compose SDK
38-
implementation("io.getstream:stream-video-android-compose:0.2.2")
38+
implementation("io.getstream:stream-video-android-compose:0.3.0")
3939

4040
// Jetpack Compose (optional/ android studio typically adds them when you create a new project)
4141
implementation(platform("androidx.compose:compose-bom:2023.06.00"))

docusaurus/docs/Android/03-guides/06-querying-calls.mdx

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,25 @@ val sort = listOf(SortField.Asc("starts_at"))
3535
val result = client.queryCalls(filters=filters, sort=sort, limit=10, watch=true)
3636
```
3737

38+
**Pagination**
39+
The query response is paginated and the maximum count of items is defined by the `limit` parameter.
40+
Use the `prev` and `next` parameters from the last response as parameters for requesting the next page.
41+
42+
```kotlin
43+
// Request first page (prev and next are not set)
44+
val resultPage1 = client.queryCalls(filters=emptyMap(), limit=10)
45+
...
46+
val resultPage1 = queryResult as Result.Success
47+
48+
// Request second page with prev and next parameters from previous response
49+
val resultPage2 = client.queryCalls(
50+
filters = emptyMap(),
51+
limit = 10,
52+
prev = resultPage1.value.prev,
53+
next = resultPage1.value.next
54+
)
55+
```
56+
3857
**Calls that live/ currently have participants**
3958

4059
```kotlin

docusaurus/docs/Android/06-advanced/04-chat-with-video.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Let the project sync. It should have all the dependencies required for you to fi
3131
```groovy
3232
dependencies {
3333
// Stream Video Compose SDK
34-
implementation("io.getstream:stream-video-android-compose:0.2.2")
34+
implementation("io.getstream:stream-video-android-compose:0.3.0")
3535
3636
// Stream Chat
3737
implementation(libs.stream.chat.compose)

dogfooding/src/main/kotlin/io/getstream/video/android/ui/call/ChatDialog.kt

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,32 @@
1818

1919
package io.getstream.video.android.ui.call
2020

21-
import androidx.compose.foundation.layout.Box
21+
import androidx.compose.foundation.background
22+
import androidx.compose.foundation.clickable
23+
import androidx.compose.foundation.layout.Column
2224
import androidx.compose.foundation.layout.fillMaxWidth
2325
import androidx.compose.foundation.layout.height
26+
import androidx.compose.foundation.layout.padding
2427
import androidx.compose.foundation.shape.RoundedCornerShape
2528
import androidx.compose.material.ExperimentalMaterialApi
29+
import androidx.compose.material.Icon
2630
import androidx.compose.material.ModalBottomSheetLayout
2731
import androidx.compose.material.ModalBottomSheetState
2832
import androidx.compose.runtime.Composable
2933
import androidx.compose.runtime.LaunchedEffect
34+
import androidx.compose.runtime.remember
35+
import androidx.compose.ui.Alignment
3036
import androidx.compose.ui.Modifier
3137
import androidx.compose.ui.platform.LocalContext
38+
import androidx.compose.ui.res.painterResource
3239
import androidx.compose.ui.unit.dp
3340
import androidx.lifecycle.viewmodel.compose.viewModel
3441
import io.getstream.chat.android.compose.ui.messages.MessagesScreen
3542
import io.getstream.chat.android.compose.ui.theme.ChatTheme
3643
import io.getstream.chat.android.compose.viewmodel.messages.MessageListViewModel
3744
import io.getstream.chat.android.compose.viewmodel.messages.MessagesViewModelFactory
3845
import io.getstream.video.android.core.Call
46+
import io.getstream.video.android.ui.common.R
3947

4048
@Composable
4149
internal fun ChatDialog(
@@ -46,13 +54,14 @@ internal fun ChatDialog(
4654
onDismissed: () -> Unit,
4755
) {
4856
val context = LocalContext.current
49-
val viewModelFactory = MessagesViewModelFactory(
50-
context = context,
51-
channelId = "videocall:${call.id}",
52-
)
53-
57+
val viewModelFactory = remember {
58+
MessagesViewModelFactory(
59+
context = context,
60+
channelId = "videocall:${call.id}",
61+
)
62+
}
5463
val listViewModel = viewModel(MessageListViewModel::class.java, factory = viewModelFactory)
55-
val unreadCount: Int = listViewModel.currentMessagesState.unreadCount
64+
val unreadCount = listViewModel.currentMessagesState.unreadCount
5665

5766
LaunchedEffect(key1 = unreadCount) {
5867
updateUnreadCount.invoke(unreadCount)
@@ -64,16 +73,30 @@ internal fun ChatDialog(
6473
sheetShape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp),
6574
sheetState = state,
6675
sheetContent = {
67-
Box(
68-
modifier = Modifier
69-
.fillMaxWidth()
70-
.height(500.dp),
71-
) {
72-
MessagesScreen(
73-
viewModelFactory = viewModelFactory,
74-
onBackPressed = { onDismissed.invoke() },
75-
onHeaderActionClick = { onDismissed.invoke() },
76-
)
76+
if (state.isVisible) {
77+
Column(
78+
modifier = Modifier
79+
.background(ChatTheme.colors.appBackground)
80+
.fillMaxWidth()
81+
.height(500.dp),
82+
) {
83+
Icon(
84+
modifier = Modifier
85+
.align(Alignment.End)
86+
.padding(16.dp)
87+
.clickable { onDismissed.invoke() },
88+
tint = ChatTheme.colors.textHighEmphasis,
89+
painter = painterResource(id = R.drawable.stream_video_ic_close),
90+
contentDescription = null,
91+
)
92+
93+
MessagesScreen(
94+
showHeader = false,
95+
viewModelFactory = viewModelFactory,
96+
onBackPressed = { onDismissed.invoke() },
97+
onHeaderActionClick = { onDismissed.invoke() },
98+
)
99+
}
77100
}
78101
},
79102
content = content,

0 commit comments

Comments
 (0)