fix: filter self from connecting call UI and fix dark mode text color
1. Filter out the logged-in user from the Connecting state UI, matching the existing behavior in IncomingCall state. 2. Change GroupCallNames default textColor from Color.Unspecified to MaterialTheme.colorScheme.onSurface so names are visible in dark mode (Box+background doesn't set LocalContentColor like Surface does). https://claude.ai/code/session_016sDH1SL7P8aXhcyFaFtzYu
This commit is contained in:
@@ -168,11 +168,15 @@ fun CallScreen(
|
|||||||
}
|
}
|
||||||
|
|
||||||
is CallState.Connecting -> {
|
is CallState.Connecting -> {
|
||||||
|
val otherMembers =
|
||||||
|
remember(state.peerPubKeys) {
|
||||||
|
state.peerPubKeys - accountViewModel.account.signer.pubKey
|
||||||
|
}
|
||||||
if (isInPipMode) {
|
if (isInPipMode) {
|
||||||
PipCallUI(peerPubKeys = state.peerPubKeys, statusText = stringRes(R.string.call_connecting), accountViewModel = accountViewModel)
|
PipCallUI(peerPubKeys = otherMembers, statusText = stringRes(R.string.call_connecting), accountViewModel = accountViewModel)
|
||||||
} else {
|
} else {
|
||||||
CallInProgressUI(
|
CallInProgressUI(
|
||||||
peerPubKeys = state.peerPubKeys,
|
peerPubKeys = otherMembers,
|
||||||
statusText = stringRes(R.string.call_connecting),
|
statusText = stringRes(R.string.call_connecting),
|
||||||
accountViewModel = accountViewModel,
|
accountViewModel = accountViewModel,
|
||||||
onHangup = { scope.launch { callManager.hangup() } },
|
onHangup = { scope.launch { callManager.hangup() } },
|
||||||
@@ -892,7 +896,7 @@ private fun GroupCallPictures(
|
|||||||
private fun GroupCallNames(
|
private fun GroupCallNames(
|
||||||
peerPubKeys: Set<String>,
|
peerPubKeys: Set<String>,
|
||||||
accountViewModel: AccountViewModel,
|
accountViewModel: AccountViewModel,
|
||||||
textColor: Color = Color.Unspecified,
|
textColor: Color = MaterialTheme.colorScheme.onSurface,
|
||||||
) {
|
) {
|
||||||
val userList = remember(peerPubKeys) { peerPubKeys.toList() }
|
val userList = remember(peerPubKeys) { peerPubKeys.toList() }
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user