Skip to content

Commit

Permalink
Merge branch 'refs/heads/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
aleksandar-apostolov committed Sep 17, 2024
2 parents 94b4a76 + 7080ea2 commit e9fec70
Show file tree
Hide file tree
Showing 31 changed files with 327 additions and 150 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ jobs:
./gradlew :stream-video-android-core:testDebugUnitTest --scan --stacktrace
- name: Unit tests core results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: unit-tests-core-results
path: stream-video-android-core/build/reports/tests/testDebugUnitTest/index.html

- name: Unit tests compose results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: unit-tests-compose-results
path: stream-video-android-ui-compose/build/reports/tests/testDebugUnitTest/index.html
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/app-distribute.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Assemble
run: bash ./gradlew :demo-app:assembleRelease --stacktrace
- name: Upload APK
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: demo-app-release
path: demo-app/build/outputs/apk/demo-app/release/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/artifact-upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: ./gradlew bundleRelease --stacktrace

- name: Upload AAB as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: app-bundle
path: demo-app/build/outputs/bundle/productionRelease/demo-app-production-release.aab
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.getByType
import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag

/**
* Configure Compose-specific options
Expand All @@ -31,7 +32,7 @@ internal fun Project.configureAndroidCompose(
}

extensions.configure<ComposeCompilerGradlePluginExtension> {
enableStrongSkippingMode = true
featureFlags.addAll(ComposeFeatureFlag.StrongSkipping, ComposeFeatureFlag.IntrinsicRemember)
reportsDestination = layout.buildDirectory.dir("compose_compiler")
stabilityConfigurationFile = rootProject.layout.projectDirectory.file("compose_compiler_config.conf")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ object Configuration {
const val minSdk = 24
const val majorVersion = 1
const val minorVersion = 0
const val patchVersion = 13
const val patchVersion = 14
const val versionName = "$majorVersion.$minorVersion.$patchVersion"
const val versionCode = 37
const val versionCode = 38
const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
const val artifactGroup = "io.getstream"
const val streamVideoCallGooglePlayVersion = "1.1.6"
const val streamVideoCallGooglePlayVersion = "1.1.7"
const val streamWebRtcVersionName = "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import androidx.compose.material.icons.filled.CallEnd
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
Expand All @@ -48,7 +47,6 @@ import io.getstream.video.android.mock.StreamPreviewDataUtils
import io.getstream.video.android.mock.previewCall
import io.getstream.video.android.tooling.extensions.toPx

@OptIn(ExperimentalComposeUiApi::class)
@Composable
fun LandscapeControls(call: Call, onDismiss: () -> Unit) {
val isCameraEnabled by call.camera.isEnabled.collectAsStateWithLifecycle()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,10 @@
* limitations under the License.
*/

@file:OptIn(ExperimentalLayoutApi::class)

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

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.AutoAwesome
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package io.getstream.video.android.ui.call

import android.content.ClipboardManager
import android.content.Context
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
Expand Down Expand Up @@ -100,7 +99,6 @@ fun ParticipantsList(call: Call) {
ParticipantsListContent(call, clipboardManager, participants)
}

@OptIn(ExperimentalFoundationApi::class)
@Composable
fun ParticipantsListContent(
call: Call,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
Expand All @@ -48,7 +47,7 @@ import androidx.compose.material.icons.filled.Email
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.outlined.Adb
import androidx.compose.material.icons.outlined.GroupAdd
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material.ripple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
Expand Down Expand Up @@ -408,7 +407,7 @@ private fun BuiltInUsersLoginDialog(
.fillMaxWidth()
.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = rememberRipple(bounded = true),
indication = ripple(bounded = true),
onClick = {
login(true, LoginEvent.SignIn(user))
onDismissRequest()
Expand Down Expand Up @@ -439,7 +438,6 @@ private fun BuiltInUsersLoginDialog(
)
}

@OptIn(ExperimentalLayoutApi::class)
@Composable
fun SelectableDialog(
items: List<StreamEnvironment>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
Expand All @@ -63,7 +62,7 @@ import io.getstream.video.android.util.filters.SampleAudioFilter
import kotlinx.coroutines.launch
import java.nio.ByteBuffer

@OptIn(ExperimentalComposeUiApi::class, ExperimentalPermissionsApi::class)
@OptIn(ExperimentalPermissionsApi::class)
@Composable
internal fun SettingsMenu(
call: Call,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ object StreamVideoInitHelper {
)
authData.token
},
appName = "Stream Video Demo App",
).build()
}
}
33 changes: 19 additions & 14 deletions docusaurus/docs/Android/03-guides/07-querying-calls.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ val sort = listOf(SortField.Asc("starts_at"))
val result = client.queryCalls(filters=filters, sort=sort, limit=10, watch=true)
```

**Calls that are ongoing / currently have participants**

```kotlin
client.queryCalls(mapOf("ongoing" to true)).let { result ->
result
.onSuccess { calls: QueriedCalls -> Log.d(TAG, "Query success: $calls") }
.onError { error: Error -> Log.e(TAG, "Query failure: ${error.message}") }
}
```

**Calls filters on a custom property**

```kotlin
Expand All @@ -36,6 +46,7 @@ val result = client.queryCalls(filters=filters, sort=sort, limit=10, watch=true)
```

**Pagination**

The query response is paginated and the maximum count of items is defined by the `limit` parameter.
Use the `prev` and `next` parameters from the last response as parameters for requesting the next page.

Expand All @@ -54,12 +65,6 @@ val resultPage2 = client.queryCalls(
)
```

**Calls that live/ currently have participants**

```kotlin
TODO
```

### Fields for Query Calls

You can filter on the following fields
Expand All @@ -78,15 +83,15 @@ You can filter on the following fields
| `members` | Check if you are a member of this call |
| `custom` | You can query custom data using the "custom.myfield" syntax |

Sorting is supported on these fields below:
Sorting is supported on the fields below:

* starts_at
* created_at
* updated_at
* ended_at
* type
* id
* cid
* `starts_at`
* `created_at`
* `updated_at`
* `ended_at`
* `type`
* `id`
* `cid`

If you specify `watch` the SDK will automatically keep the data about these calls updated.
This allows you to show a live preview of who's in the call.
Loading

0 comments on commit e9fec70

Please sign in to comment.