Merge pull request #583 from GetStream/develop

Develop commits against the main branch

Author: skydoves

README.md

@@ -66,37 +66,44 @@ Video roadmap and changelog is available [here](https://github.com/GetStream/pro
 
 ### 0.2.0 milestone
 
-- [ ] bug: screensharing is broken. android doesn’t receive/render (not sure) the screenshare. video shows up as the gray avatar (Thierry)
-- [ ] bug: screenshare is not removed after it stops when a participant leaves the call (Thierry) (probably just dont update the state when the participant leaves)
-- [ ] Livestream tutorial
 - [ ] Deeplink support for video call demo & dogfooding app (skip auth for the video demo, keep it for dogfooding)
 - [ ] Chat Integration
 - [ ] XML version of VideoRenderer
 - [ ] Call Analytics stateflow
 - [ ] Automatically handle pagination and sorting on > 6 participants 
+- [ ] Make it easy to test ringing support
+- [ ] publish app on play store
+- [ ] report version number of SDK on all API calls
+- [ ] bug: screensharing is broken. android doesn’t receive/render (not sure) the screenshare. video shows up as the gray avatar
 - [X] Reactions
+- [X] bug: screenshare is not removed after it stops when a participant leaves the call (Thierry) (probably just dont update the state when the participant leaves)
 
 ### 0.3.0 milestone
 
-- [ ] H264 workaround on S23 (see https://github.com/livekit/client-sdk-android/blob/main/livekit-android-sdk/src/main/java/io/livekit/android/webrtc/SimulcastVideoEncoderFactoryWrapper.kt#L34 and
+- [ ] Setting to default to speakerphone or earpiece
+- [ ] Button to switch speakerphone/earpiece
+- [ ] Livestream tutorial (depends on RTMP support)
+- [ ] H264 workaround on Samsung 23 (see https://github.com/livekit/client-sdk-android/blob/main/livekit-android-sdk/src/main/java/io/livekit/android/webrtc/SimulcastVideoEncoderFactoryWrapper.kt#L34 and
 - https://github.com/react-native-webrtc/react-native-webrtc/issues/983#issuecomment-975624906)
 - [ ] Bluetooth reliability
 - [ ] Dynascale 2.0 (codecs, f resolution switches, resolution webrtc handling)
 - [ ] Test coverage
 - [ ] Testing on more devices
 - [ ] Speaking while muted stateflow
-- [ ] Cleanup the retry behaviour in the RtcSession (see the TODO)
-- [ ] Android SDK development.md cleanup
+- [X] Cleanup the retry behaviour in the RtcSession
+- [ ] Android SDK development.md cleanup (Daniel)
 - [X] SDK development guide for all teams
 
 ### 0.4.0 milestone
 
+- [ ] Pagination on query members & query channels
 - [ ] Analytics integration
 - [ ] Screensharing from mobile
 - [ ] Tap to focus
 - [ ] Camera controls
 - [ ] Audio & Video filters
 - [ ] Picture of the video stream at highest resolution
+- [ ] Review foreground service vs backend for some things like screensharing etc
 
 ## 💼 We are hiring!
 

development.md

@@ -123,7 +123,7 @@ Typically for development you want to fail fast and loud. For production you wan
 ### RTC offer/answer cycle
 
 * sessionId is created locally as a random UUID
-* create the peer connections
+* create two peer connections (publisher and subscriber)
 * capture audio and video (if we're not doing so already, in many apps it should already be on for the preview screen)
 * execute the join request
 * add the audio/video tracks which triggers onNegotiationNeeded
@@ -207,18 +207,6 @@ With the second approach everything is easy to understand and customize.
 * Clicking accept or reject fires triggers the accept/reject API endpoints
 * Call members have an accepted_at, rejected_at field
 
-Ringing state on a call has the following options
-
-```kotlin
-sealed class RingingState() {
-    object Incoming : RingingState()
-    object Outgoing : RingingState()
-    object Active : RingingState()
-    object RejectedByAll : RingingState()
-    object TimeoutNoAnswer : RingingState()
-}
-```
-
 ### Media Manager
 
 The media manager should support capturing local video with or without joining a call

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

@@ -97,7 +97,9 @@ class MainActivity : ComponentActivity() {
                     "description" to "Talk about how easy compose makes it to reuse and combine UI"
                 )
             ))
-            result.getOrThrow()
+            result.onError {
+                Toast.makeText(this, it.message, Toast.LENGTH_SHORT).show()
+            }
         }
 
         setContent {
@@ -199,13 +201,14 @@ Now when you run the sample app it will connect successfully and you will see a
 In this next step we're going to:
 
 1. Request Android Runtime permissions (audio)
+2. Mute and Unmute microphone toggle button
 2. Create a list of participants
 3. An indicator for who's speaking
 
 #### A. Requesting Android Runtime Permissions
 
 To capture the microphone output we need to request [Android runtime permissions](https://source.android.com/docs/core/permissions/runtime_perms).
-In `MainActivity.kt` just below setContent add the line `LaunchMicrophonePermissions(call = call)`
+In `MainActivity.kt` just below `setContent` add the line `LaunchMicrophonePermissions(call = call)`
 
 ```kotlin
 setContent {
@@ -217,7 +220,23 @@ setContent {
 The launch call permissions will request permissions when you open the call.
 Review the [permissions docs](../05-ui-cookbook/08-permissions-request.mdx) to learn more about how you can easily request permissions.
 
-#### B. Create a list of participants
+#### B. Add a toggle button to mute/unmute microphone
+
+Next, let's create a toggle button to mute and unmute a microphone.
+
+You can simply connect the state of a microphone toggle button with the call's device manager with using `ToggleMicrophoneAction` and `call.microphone`:
+
+```kotlin
+val isMicrophoneEnabled by call.microphone.isEnabled.collectAsState()
+
+ToggleMicrophoneAction(
+    modifier = Modifier.size(52.dp),
+    isMicrophoneEnabled = isMicrophoneEnabled,
+    onCallAction = { call.microphone.setEnabled(it.isEnabled) }
+)
+```
+
+#### C. Create a list of participants
 
 Let's create a component for the active speaker and the list of participants.
 
@@ -230,9 +249,9 @@ fun ParticipantAvatar(participant : ParticipantState) {
 }
 ```
 
-#### B. An indicator for who's speaking
+#### D. An indicator for who's speaking
 
-We'll use the basic `ParticipantAvatar` to build an audio room
+We'll use the basic `ParticipantAvatar` to build an audio room:
 
 ```kotlin
 setContent {
@@ -278,6 +297,13 @@ setContent {
                 }
             }
 
+            val isMicrophoneEnabled by call.microphone.isEnabled.collectAsState()
+            ToggleMicrophoneAction(
+                modifier = Modifier.size(52.dp),
+                isMicrophoneEnabled = isMicrophoneEnabled,
+                onCallAction = { call.microphone.setEnabled(it.isEnabled) }
+            )
+
             Button(
                 onClick = {
                     lifecycleScope.launch {

docusaurus/docs/Android/03-guides/05-call-types.mdx

@@ -3,9 +3,12 @@ title: Call Types
 description: How Call Types control features and permissions
 ---
 
+import CallTypesPage from "../../../shared/video/_call-types.md";
+
 ### Call Types
 
 When you create a call like this
+
 ```kotlin
 val call = client.call("default", "123")
 ```
@@ -14,18 +17,4 @@ You create a call of the type `default` with id `123`.
 
 There are 4 built-in call types and you can also create your own.
 
-### Default call types
-
-* `development`: Everything is allowed, no permission checks. Great for development, bad for production usage.
-* `default`: Good defaults for 1 on 1 or group calls. This will work for most video calling apps.
-* `audio_room`: Default for audio rooms. Calls start out in backstage mode by default and you can go live when you want.
-* `livestream`: Default for livestreams.
-
-### Features & Settings
-
-The following features and settings are controlled by the call types
-
-TODO
-
-
-https://www.notion.so/stream-wiki/Call-Types-9741753a0d77428fb4ff51dc1328314e
+<CallTypesPage />

dogfooding/build.gradle.kts

@@ -39,7 +39,7 @@ android {
         minSdk = Configuration.minSdk
         targetSdk = Configuration.targetSdk
         versionCode = 1
-        versionName = "1.0"
+        versionName = "1.0.0"
         vectorDrawables {
             useSupportLibrary = true
         }