-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update sort order based on UI visibility of the participants.
- Loading branch information
1 parent
530574f
commit c5c7257
Showing
12 changed files
with
394 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
...oid-core/src/main/kotlin/io/getstream/video/android/core/model/VisibilityOnScreenState.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * Copyright (c) 2014-2023 Stream.io Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Stream License; | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://github.com/GetStream/stream-video-android/blob/main/LICENSE | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.getstream.video.android.core.model | ||
|
|
||
| /** | ||
| * Participant visibility on the screen. | ||
| */ | ||
| enum class VisibilityOnScreenState { | ||
| /** The participant is visible on the screen. */ | ||
| VISIBLE, | ||
|
|
||
| /** The participant is not visible on the screen. */ | ||
| INVISIBLE, | ||
|
|
||
| /** It is unknown if the participant is visible. */ | ||
| UNKNOWN, | ||
| } |
68 changes: 68 additions & 0 deletions
68
...-android-core/src/main/kotlin/io/getstream/video/android/core/sorting/DefaultSortOrder.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright (c) 2014-2023 Stream.io Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Stream License; | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://github.com/GetStream/stream-video-android/blob/main/LICENSE | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.getstream.video.android.core.sorting | ||
|
|
||
| import io.getstream.video.android.core.ParticipantState | ||
| import io.getstream.video.android.core.model.VisibilityOnScreenState | ||
| import io.getstream.video.android.core.utils.combineComparators | ||
|
|
||
| /** | ||
| * Default comparator for the participants. | ||
| * Returns a function that takes a set of the pinned participants before starting the sorting. | ||
| */ | ||
| internal val defaultComparator: (pinned: Set<String>) -> Comparator<ParticipantState> = { pinned -> | ||
| combineComparators( | ||
| onlyIfInvisibleOrUnknown( | ||
| { it.userId.value }, | ||
| { it.joinedAt.value }, | ||
| { it.audioEnabled.value }, | ||
| { it.videoEnabled.value }, | ||
| { it.dominantSpeaker.value }, | ||
| ), | ||
| compareBy( | ||
| { it.screenSharingEnabled.value }, | ||
| { pinned.contains(it.sessionId) }, | ||
| ), | ||
| ) | ||
| } | ||
|
|
||
| /** | ||
| * Conditional comparator for visibility. | ||
| */ | ||
| private fun onlyIfInvisibleOrUnknown( | ||
| vararg selectors: (ParticipantState) -> Comparable<*>?, | ||
| ): Comparator<ParticipantState> { | ||
| return Comparator { p1, p2 -> | ||
| if (p1.visibleOnScreen.value != VisibilityOnScreenState.VISIBLE || | ||
| p2.visibleOnScreen.value != VisibilityOnScreenState.VISIBLE | ||
| ) { | ||
| var comparisonResult = 0 | ||
| for (selector in selectors) { | ||
| val valueToCompare1 = selector(p1) | ||
| val valueToCompare2 = selector(p2) | ||
| val diff = compareValues(valueToCompare1, valueToCompare2) | ||
| if (diff != 0) { | ||
| comparisonResult = diff | ||
| break | ||
| } | ||
| } | ||
| comparisonResult | ||
| } else { | ||
| 0 | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.