Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ fun AppNavHost(
composable(AppScreens.DirectCallJoin.route) {
val context = LocalContext.current
DirectCallJoinScreen(
navigateToDirectCall = { cid, members ->
navigateToDirectCall = { cid, members, joinAndRing ->
context.startActivity(
StreamCallActivity.callIntent(
action = NotificationHandler.ACTION_OUTGOING_CALL,
Expand All @@ -101,6 +101,7 @@ fun AppNavHost(
leaveWhenLastInCall = true,
context = context,
cid = cid,
joinAndRing = joinAndRing,
members = members.split(","),
clazz = CallActivity::class.java,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.Checkbox
import androidx.compose.material.CircularProgressIndicator
import androidx.compose.material.RadioButton
import androidx.compose.material.RadioButtonDefaults
Expand All @@ -40,7 +41,11 @@ import androidx.compose.material.icons.filled.VideoCall
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Alignment.Companion.CenterVertically
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
Expand All @@ -62,7 +67,7 @@ import java.util.UUID
@Composable
fun DirectCallJoinScreen(
viewModel: DirectCallJoinViewModel = hiltViewModel(),
navigateToDirectCall: (cid: StreamCallId, memberList: String) -> Unit,
navigateToDirectCall: (cid: StreamCallId, memberList: String, joinAndRing: Boolean) -> Unit,
) {
val uiState by viewModel.uiState.collectAsStateWithLifecycle()

Expand Down Expand Up @@ -128,8 +133,10 @@ private fun Header(user: User?) {
private fun Body(
uiState: DirectCallUiState,
toggleUserSelection: (Int) -> Unit,
onStartCallClick: (cid: StreamCallId, membersList: String) -> Unit,
onStartCallClick: (cid: StreamCallId, membersList: String, joinAndRing: Boolean) -> Unit,
) {
var callerJoinsFirst by rememberSaveable { mutableStateOf(false) }

Box(
modifier = Modifier
.fillMaxSize()
Expand All @@ -145,15 +152,27 @@ private fun Body(
} else {
uiState.otherUsers?.let { users ->
Column(
modifier = Modifier.align(Alignment.TopStart)
modifier = Modifier
.align(Alignment.TopStart)
.padding(bottom = 80.dp),
) {
Row(
verticalAlignment = CenterVertically,
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 10.dp),
horizontalArrangement = Arrangement.SpaceBetween,
) {
Text("Join First", color = Color.White)
Checkbox(callerJoinsFirst, onCheckedChange = {
callerJoinsFirst = !callerJoinsFirst
})
}
UserList(
entries = users,
onUserClick = { clickedIndex -> toggleUserSelection(clickedIndex) },
)
}

Row(
Modifier
.fillMaxWidth()
Expand All @@ -178,6 +197,7 @@ private fun Body(
users
.filter { it.isSelected }
.joinToString(separator = ",") { it.user.id ?: "" },
callerJoinsFirst,
)
},
)
Expand All @@ -198,6 +218,7 @@ private fun Body(
users
.filter { it.isSelected }
.joinToString(separator = ",") { it.user.id ?: "" },
callerJoinsFirst,
)
},
)
Expand Down Expand Up @@ -294,7 +315,7 @@ private fun HeaderPreview() {
},
),
toggleUserSelection = {},
) { _, _ ->
) { _, _, _ ->
}
}
}
Loading
Loading