Committed by
GitHub
Remove compose from livekit-android-sdk (#355)
正在显示
5 个修改的文件
包含
6 行增加
和
199 行删除
| @@ -50,14 +50,16 @@ dependencies { | @@ -50,14 +50,16 @@ dependencies { | ||
| 50 | } | 50 | } |
| 51 | ``` | 51 | ``` |
| 52 | 52 | ||
| 53 | +Compose-based apps should check out our [Android Components SDK](https://github.com/livekit/components-android) for composables support. | ||
| 54 | + | ||
| 53 | You'll also need jitpack as one of your repositories. | 55 | You'll also need jitpack as one of your repositories. |
| 54 | 56 | ||
| 55 | -```groovy | ||
| 56 | -subprojects { | 57 | +```groovy title="settings.gradle" |
| 58 | +dependencyResolutionManagement { | ||
| 57 | repositories { | 59 | repositories { |
| 58 | google() | 60 | google() |
| 59 | mavenCentral() | 61 | mavenCentral() |
| 60 | - // ... | 62 | + //... |
| 61 | maven { url 'https://jitpack.io' } | 63 | maven { url 'https://jitpack.io' } |
| 62 | 64 | ||
| 63 | // For SNAPSHOT access | 65 | // For SNAPSHOT access |
| @@ -57,12 +57,8 @@ android { | @@ -57,12 +57,8 @@ android { | ||
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | buildFeatures { | 59 | buildFeatures { |
| 60 | - compose true | ||
| 61 | buildConfig = true | 60 | buildConfig = true |
| 62 | } | 61 | } |
| 63 | - composeOptions { | ||
| 64 | - kotlinCompilerExtensionVersion compose_compiler_version | ||
| 65 | - } | ||
| 66 | kotlinOptions { | 62 | kotlinOptions { |
| 67 | freeCompilerArgs = ["-Xinline-classes", "-opt-in=kotlin.RequiresOptIn"] | 63 | freeCompilerArgs = ["-Xinline-classes", "-opt-in=kotlin.RequiresOptIn"] |
| 68 | jvmTarget = java_version | 64 | jvmTarget = java_version |
| @@ -153,7 +149,6 @@ dependencies { | @@ -153,7 +149,6 @@ dependencies { | ||
| 153 | implementation deps.androidx.annotation | 149 | implementation deps.androidx.annotation |
| 154 | implementation "androidx.core:core:${versions.androidx_core}" | 150 | implementation "androidx.core:core:${versions.androidx_core}" |
| 155 | implementation "com.google.protobuf:protobuf-javalite:${versions.protobuf}" | 151 | implementation "com.google.protobuf:protobuf-javalite:${versions.protobuf}" |
| 156 | - implementation "androidx.compose.ui:ui:$compose_version" | ||
| 157 | 152 | ||
| 158 | implementation 'javax.sip:android-jain-sip-ri:1.3.0-91' | 153 | implementation 'javax.sip:android-jain-sip-ri:1.3.0-91' |
| 159 | 154 |
| 1 | -/* | ||
| 2 | - * Copyright 2023 LiveKit, Inc. | ||
| 3 | - * | ||
| 4 | - * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| 5 | - * you may not use this file except in compliance with the License. | ||
| 6 | - * You may obtain a copy of the License at | ||
| 7 | - * | ||
| 8 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
| 9 | - * | ||
| 10 | - * Unless required by applicable law or agreed to in writing, software | ||
| 11 | - * distributed under the License is distributed on an "AS IS" BASIS, | ||
| 12 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| 13 | - * See the License for the specific language governing permissions and | ||
| 14 | - * limitations under the License. | ||
| 15 | - */ | ||
| 16 | - | ||
| 17 | -package io.livekit.android.compose | ||
| 18 | - | ||
| 19 | -import androidx.compose.runtime.Composable | ||
| 20 | -import androidx.compose.runtime.DisposableEffect | ||
| 21 | -import androidx.compose.runtime.currentCompositeKeyHash | ||
| 22 | -import androidx.compose.runtime.getValue | ||
| 23 | -import androidx.compose.runtime.mutableStateOf | ||
| 24 | -import androidx.compose.runtime.remember | ||
| 25 | -import androidx.compose.runtime.setValue | ||
| 26 | -import androidx.compose.ui.Modifier | ||
| 27 | -import androidx.compose.ui.layout.onGloballyPositioned | ||
| 28 | -import androidx.compose.ui.viewinterop.AndroidView | ||
| 29 | -import io.livekit.android.renderer.TextureViewRenderer | ||
| 30 | -import io.livekit.android.room.Room | ||
| 31 | -import io.livekit.android.room.track.RemoteVideoTrack | ||
| 32 | -import io.livekit.android.room.track.VideoTrack | ||
| 33 | -import io.livekit.android.room.track.video.ComposeVisibility | ||
| 34 | - | ||
| 35 | -/** | ||
| 36 | - * Widget for displaying a VideoTrack. Handles the Compose <-> AndroidView interop needed to use | ||
| 37 | - * [TextureViewRenderer]. | ||
| 38 | - */ | ||
| 39 | -@Composable | ||
| 40 | -fun VideoRenderer( | ||
| 41 | - room: Room, | ||
| 42 | - videoTrack: VideoTrack?, | ||
| 43 | - modifier: Modifier = Modifier, | ||
| 44 | - mirror: Boolean = false, | ||
| 45 | -) { | ||
| 46 | - val videoSinkVisibility = remember(room, videoTrack) { ComposeVisibility() } | ||
| 47 | - var boundVideoTrack by remember { mutableStateOf<VideoTrack?>(null) } | ||
| 48 | - var view: TextureViewRenderer? by remember { mutableStateOf(null) } | ||
| 49 | - | ||
| 50 | - fun cleanupVideoTrack() { | ||
| 51 | - view?.let { boundVideoTrack?.removeRenderer(it) } | ||
| 52 | - boundVideoTrack = null | ||
| 53 | - } | ||
| 54 | - | ||
| 55 | - fun setupVideoIfNeeded(videoTrack: VideoTrack?, view: TextureViewRenderer) { | ||
| 56 | - if (boundVideoTrack == videoTrack) { | ||
| 57 | - return | ||
| 58 | - } | ||
| 59 | - | ||
| 60 | - cleanupVideoTrack() | ||
| 61 | - | ||
| 62 | - boundVideoTrack = videoTrack | ||
| 63 | - if (videoTrack != null) { | ||
| 64 | - if (videoTrack is RemoteVideoTrack) { | ||
| 65 | - videoTrack.addRenderer(view, videoSinkVisibility) | ||
| 66 | - } else { | ||
| 67 | - videoTrack.addRenderer(view) | ||
| 68 | - } | ||
| 69 | - } | ||
| 70 | - } | ||
| 71 | - | ||
| 72 | - DisposableEffect(view, mirror) { | ||
| 73 | - view?.setMirror(mirror) | ||
| 74 | - onDispose { } | ||
| 75 | - } | ||
| 76 | - | ||
| 77 | - DisposableEffect(room, videoTrack) { | ||
| 78 | - onDispose { | ||
| 79 | - videoSinkVisibility.onDispose() | ||
| 80 | - cleanupVideoTrack() | ||
| 81 | - } | ||
| 82 | - } | ||
| 83 | - | ||
| 84 | - DisposableEffect(currentCompositeKeyHash.toString()) { | ||
| 85 | - onDispose { | ||
| 86 | - view?.release() | ||
| 87 | - } | ||
| 88 | - } | ||
| 89 | - | ||
| 90 | - AndroidView( | ||
| 91 | - factory = { context -> | ||
| 92 | - TextureViewRenderer(context).apply { | ||
| 93 | - room.initVideoRenderer(this) | ||
| 94 | - setupVideoIfNeeded(videoTrack, this) | ||
| 95 | - view = this | ||
| 96 | - } | ||
| 97 | - }, | ||
| 98 | - update = { v -> setupVideoIfNeeded(videoTrack, v) }, | ||
| 99 | - modifier = modifier | ||
| 100 | - .onGloballyPositioned { videoSinkVisibility.onGloballyPositioned(it) }, | ||
| 101 | - ) | ||
| 102 | -} |
livekit-android-sdk/src/main/java/io/livekit/android/room/track/video/ComposeVisibility.kt
已删除
100644 → 0
| 1 | -/* | ||
| 2 | - * Copyright 2023-2024 LiveKit, Inc. | ||
| 3 | - * | ||
| 4 | - * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| 5 | - * you may not use this file except in compliance with the License. | ||
| 6 | - * You may obtain a copy of the License at | ||
| 7 | - * | ||
| 8 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
| 9 | - * | ||
| 10 | - * Unless required by applicable law or agreed to in writing, software | ||
| 11 | - * distributed under the License is distributed on an "AS IS" BASIS, | ||
| 12 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| 13 | - * See the License for the specific language governing permissions and | ||
| 14 | - * limitations under the License. | ||
| 15 | - */ | ||
| 16 | - | ||
| 17 | -package io.livekit.android.room.track.video | ||
| 18 | - | ||
| 19 | -import androidx.compose.ui.layout.LayoutCoordinates | ||
| 20 | -import io.livekit.android.room.track.Track | ||
| 21 | - | ||
| 22 | -/** | ||
| 23 | - * A [VideoSinkVisibility] for compose views. | ||
| 24 | - * | ||
| 25 | - * To use, pass an `onGloballyPositioned` modifier your composable like so: | ||
| 26 | - * ``` | ||
| 27 | - * modifier = Modifier.onGloballyPositioned { videoSinkVisibility.onGloballyPositioned(it) } | ||
| 28 | - * ``` | ||
| 29 | - */ | ||
| 30 | -class ComposeVisibility : VideoSinkVisibility() { | ||
| 31 | - private var coordinates: LayoutCoordinates? = null | ||
| 32 | - | ||
| 33 | - private var lastVisible = isVisible() | ||
| 34 | - private var lastSize = size() | ||
| 35 | - override fun isVisible(): Boolean { | ||
| 36 | - return (coordinates?.isAttached == true && | ||
| 37 | - coordinates?.size?.width != 0 && | ||
| 38 | - coordinates?.size?.height != 0) | ||
| 39 | - } | ||
| 40 | - | ||
| 41 | - override fun size(): Track.Dimensions { | ||
| 42 | - val width = coordinates?.size?.width ?: 0 | ||
| 43 | - val height = coordinates?.size?.height ?: 0 | ||
| 44 | - return Track.Dimensions(width, height) | ||
| 45 | - } | ||
| 46 | - | ||
| 47 | - /** | ||
| 48 | - * To be called from a compose view, using `Modifier.onGloballyPositioned`. | ||
| 49 | - * | ||
| 50 | - * Example: | ||
| 51 | - * ``` | ||
| 52 | - * modifier = Modifier.onGloballyPositioned { videoSinkVisibility.onGloballyPositioned(it) } | ||
| 53 | - * ``` | ||
| 54 | - */ | ||
| 55 | - fun onGloballyPositioned(layoutCoordinates: LayoutCoordinates) { | ||
| 56 | - // Note, LayoutCoordinates are mutable and may be reused. | ||
| 57 | - coordinates = layoutCoordinates | ||
| 58 | - val visible = isVisible() | ||
| 59 | - val size = size() | ||
| 60 | - | ||
| 61 | - if (lastVisible != visible || lastSize != size) { | ||
| 62 | - notifyChanged() | ||
| 63 | - } | ||
| 64 | - | ||
| 65 | - lastVisible = visible | ||
| 66 | - lastSize = size | ||
| 67 | - } | ||
| 68 | - | ||
| 69 | - /** | ||
| 70 | - * To be called when the associated compose view no longer exists. | ||
| 71 | - * | ||
| 72 | - * Example: | ||
| 73 | - * ``` | ||
| 74 | - * DisposableEffect(room, videoTrack) { | ||
| 75 | - * onDispose { | ||
| 76 | - * videoSinkVisibility.onDispose() | ||
| 77 | - * } | ||
| 78 | - * } | ||
| 79 | - * ``` | ||
| 80 | - */ | ||
| 81 | - fun onDispose() { | ||
| 82 | - if (coordinates == null) { | ||
| 83 | - return | ||
| 84 | - } | ||
| 85 | - coordinates = null | ||
| 86 | - notifyChanged() | ||
| 87 | - } | ||
| 88 | -} |
| @@ -29,7 +29,7 @@ import androidx.compose.ui.Alignment | @@ -29,7 +29,7 @@ import androidx.compose.ui.Alignment | ||
| 29 | import androidx.compose.ui.Modifier | 29 | import androidx.compose.ui.Modifier |
| 30 | import androidx.compose.ui.graphics.Color | 30 | import androidx.compose.ui.graphics.Color |
| 31 | import androidx.compose.ui.res.painterResource | 31 | import androidx.compose.ui.res.painterResource |
| 32 | -import io.livekit.android.compose.VideoRenderer | 32 | +import io.livekit.android.composesample.ui.VideoRenderer |
| 33 | import io.livekit.android.room.Room | 33 | import io.livekit.android.room.Room |
| 34 | import io.livekit.android.room.participant.Participant | 34 | import io.livekit.android.room.participant.Participant |
| 35 | import io.livekit.android.room.track.CameraPosition | 35 | import io.livekit.android.room.track.CameraPosition |
-
请 注册 或 登录 后发表评论