jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved call row and transfer dialog layout and colors

Browse Source
This commit is contained in:
Juha Heinanen
2025-12-03 09:27:34 +02:00
parent 08efb016cd
commit 4a14218809
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
+14 -16
View File
@@ -553,6 +553,7 @@ private fun TopAppBar(
windowInsets = WindowInsets(0, 0, 0, 0), windowInsets = WindowInsets(0, 0, 0, 0),
actions = { actions = {
Spacer(modifier = Modifier.width(8.dp))
Icon( Icon(
imageVector = recImage, imageVector = recImage,
modifier = Modifier modifier = Modifier
@@ -648,8 +649,6 @@ private fun TopAppBar(
contentDescription = null contentDescription = null
) )
Spacer(modifier = Modifier.width(8.dp))
IconButton( IconButton(
onClick = { menuExpanded = !menuExpanded } onClick = { menuExpanded = !menuExpanded }
) { ) {
@@ -1341,8 +1340,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
val isDialpadVisible by viewModel.isDialpadVisible.collectAsState() val isDialpadVisible by viewModel.isDialpadVisible.collectAsState()
Row( modifier = Modifier Row( modifier = Modifier
.fillMaxWidth() .fillMaxWidth(),
.padding(start = 6.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Absolute.SpaceBetween horizontalArrangement = Arrangement.Absolute.SpaceBetween
) { ) {
@@ -1357,7 +1355,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
) { ) {
Icon( Icon(
imageVector = Icons.Filled.Call, imageVector = Icons.Filled.Call,
modifier = Modifier.size(48.dp), modifier = Modifier.size(42.dp),
tint = colorResource(if (callButtonEnabled.value) tint = colorResource(if (callButtonEnabled.value)
R.color.colorTrafficGreen R.color.colorTrafficGreen
else else
@@ -1387,7 +1385,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
) { ) {
Icon( Icon(
imageVector = Icons.Filled.CallEnd, imageVector = Icons.Filled.CallEnd,
modifier = Modifier.size(48.dp), modifier = Modifier.size(42.dp),
tint = colorResource(R.color.colorTrafficRed), tint = colorResource(R.color.colorTrafficRed),
contentDescription = null, contentDescription = null,
) )
@@ -1413,7 +1411,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
) { ) {
Icon( Icon(
imageVector = Icons.Filled.CallEnd, imageVector = Icons.Filled.CallEnd,
modifier = Modifier.size(48.dp), modifier = Modifier.size(42.dp),
tint = colorResource(R.color.colorTrafficRed), tint = colorResource(R.color.colorTrafficRed),
contentDescription = null, contentDescription = null,
) )
@@ -1446,7 +1444,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
) { ) {
Icon( Icon(
imageVector = Icons.Outlined.PauseCircle, imageVector = Icons.Outlined.PauseCircle,
modifier = Modifier.size(48.dp), modifier = Modifier.size(42.dp),
tint = if (callOnHold.value) tint = if (callOnHold.value)
MaterialTheme.colorScheme.error MaterialTheme.colorScheme.error
else else
@@ -1476,7 +1474,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
) { ) {
Icon( Icon(
imageVector = Icons.Outlined.ArrowCircleRight, imageVector = Icons.Outlined.ArrowCircleRight,
modifier = Modifier.size(48.dp), modifier = Modifier.size(42.dp),
tint = if (callTransfer.value) tint = if (callTransfer.value)
MaterialTheme.colorScheme.error MaterialTheme.colorScheme.error
else else
@@ -1507,14 +1505,14 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
.padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 0.dp), .padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 0.dp),
shape = RoundedCornerShape(16.dp), shape = RoundedCornerShape(16.dp),
colors = CardDefaults.cardColors( colors = CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surfaceContainer containerColor = MaterialTheme.colorScheme.surfaceContainerHigh
) )
) { ) {
Column(modifier = Modifier.padding(16.dp)) { Column(modifier = Modifier.padding(16.dp)) {
Text( Text(
text = stringResource(R.string.call_transfer), text = stringResource(R.string.call_transfer),
fontSize = 20.sp, fontSize = 20.sp,
color = MaterialTheme.colorScheme.error, color = MaterialTheme.colorScheme.onSurface,
) )
var transferUri by remember { mutableStateOf("") } var transferUri by remember { mutableStateOf("") }
val suggestions by remember { contactNames } val suggestions by remember { contactNames }
@@ -1569,7 +1567,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
.fillMaxWidth() .fillMaxWidth()
.shadow(8.dp, RoundedCornerShape(8.dp)) .shadow(8.dp, RoundedCornerShape(8.dp))
.background( .background(
color = MaterialTheme.colorScheme.surfaceContainer, color = MaterialTheme.colorScheme.surfaceContainerHigh,
shape = RoundedCornerShape(8.dp) shape = RoundedCornerShape(8.dp)
) )
.animateContentSize() .animateContentSize()
@@ -1621,7 +1619,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
Text( Text(
text = stringResource(R.string.blind), text = stringResource(R.string.blind),
color = MaterialTheme.colorScheme.error, color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(8.dp), modifier = Modifier.padding(8.dp),
) )
Switch( Switch(
@@ -1635,7 +1633,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
Text( Text(
text = stringResource(R.string.attended), text = stringResource(R.string.attended),
color = MaterialTheme.colorScheme.error, color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(8.dp), modifier = Modifier.padding(8.dp),
) )
Switch( Switch(
@@ -1837,7 +1835,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
) { ) {
Icon( Icon(
imageVector = Icons.Filled.Call, imageVector = Icons.Filled.Call,
modifier = Modifier.size(48.dp), modifier = Modifier.size(42.dp),
tint = colorResource(R.color.colorTrafficGreen), tint = colorResource(R.color.colorTrafficGreen),
contentDescription = null, contentDescription = null,
) )
@@ -1853,7 +1851,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
) { ) {
Icon( Icon(
imageVector = Icons.Filled.CallEnd, imageVector = Icons.Filled.CallEnd,
modifier = Modifier.size(48.dp), modifier = Modifier.size(42.dp),
tint = colorResource(R.color.colorTrafficRed), tint = colorResource(R.color.colorTrafficRed),
contentDescription = null, contentDescription = null,
) )