Replace full text with call link name as title in call info sheet.
This commit is contained in:
parent
58b11f3c47
commit
46c8b3b690
1 changed files with 9 additions and 4 deletions
|
@ -52,7 +52,6 @@ import org.signal.core.ui.Rows
|
||||||
import org.signal.core.ui.theme.SignalTheme
|
import org.signal.core.ui.theme.SignalTheme
|
||||||
import org.signal.ringrtc.CallLinkState
|
import org.signal.ringrtc.CallLinkState
|
||||||
import org.thoughtcrime.securesms.R
|
import org.thoughtcrime.securesms.R
|
||||||
import org.thoughtcrime.securesms.calls.links.SignalCallRow
|
|
||||||
import org.thoughtcrime.securesms.components.AvatarImageView
|
import org.thoughtcrime.securesms.components.AvatarImageView
|
||||||
import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel
|
import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel
|
||||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
|
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
|
||||||
|
@ -165,8 +164,16 @@ private fun CallInfo(
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
) {
|
) {
|
||||||
item {
|
item {
|
||||||
|
val text = if (controlAndInfoState.callLink == null) {
|
||||||
|
stringResource(id = R.string.CallLinkInfoSheet__call_info)
|
||||||
|
} else if (controlAndInfoState.callLink.state.name.isNotEmpty()) {
|
||||||
|
controlAndInfoState.callLink.state.name
|
||||||
|
} else {
|
||||||
|
stringResource(id = R.string.Recipient_signal_call)
|
||||||
|
}
|
||||||
|
|
||||||
Text(
|
Text(
|
||||||
text = stringResource(id = R.string.CallLinkInfoSheet__call_info),
|
text = text,
|
||||||
style = MaterialTheme.typography.titleLarge,
|
style = MaterialTheme.typography.titleLarge,
|
||||||
modifier = Modifier.padding(bottom = 24.dp)
|
modifier = Modifier.padding(bottom = 24.dp)
|
||||||
)
|
)
|
||||||
|
@ -174,8 +181,6 @@ private fun CallInfo(
|
||||||
|
|
||||||
if (controlAndInfoState.callLink != null) {
|
if (controlAndInfoState.callLink != null) {
|
||||||
item {
|
item {
|
||||||
SignalCallRow(callLink = controlAndInfoState.callLink, onJoinClicked = null)
|
|
||||||
|
|
||||||
Rows.TextRow(
|
Rows.TextRow(
|
||||||
text = stringResource(id = R.string.CallLinkDetailsFragment__share_link),
|
text = stringResource(id = R.string.CallLinkDetailsFragment__share_link),
|
||||||
icon = ImageVector.vectorResource(id = R.drawable.symbol_link_24),
|
icon = ImageVector.vectorResource(id = R.drawable.symbol_link_24),
|
||||||
|
|
Loading…
Add table
Reference in a new issue