meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: ContactItem background color inconsistency

Browse source
This commit is contained in:
andrekir 2024-06-16 07:50:52 -03:00
parent d7013e1386
commit d4f4e4f14a
2 changed files with 60 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/geeksville/mesh/model/ContactsViewModel.kt
View file

@ -33,7 +33,7 @@ data class Contact(
val isMuted: Boolean,
)
// return time if within 24 hours, otherwise date/time
// return time if within 24 hours, otherwise date
internal fun getShortDateTime(time: Long): String? {
val date = if (time != 0L) Date(time) else return null
val isWithin24Hours = System.currentTimeMillis() - date.time <= 24 * 60 * 60 * 1000L
@ -41,7 +41,7 @@ internal fun getShortDateTime(time: Long): String? {
return if (isWithin24Hours) {
DateFormat.getTimeInstance(DateFormat.SHORT).format(date)
} else {
DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT).format(date)
DateFormat.getDateInstance(DateFormat.SHORT).format(date)
}
}

112
app/src/main/java/com/geeksville/mesh/ui/ContactItem.kt
View file

@ -16,6 +16,7 @@ import androidx.compose.material.Chip
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
@ -42,74 +43,77 @@ fun ContactItem(
modifier = modifier
.fillMaxWidth()
.padding(horizontal = 8.dp, vertical = 6.dp),
elevation = 2.dp,
elevation = 4.dp,
shape = RoundedCornerShape(12.dp),
) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(6.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Chip(
onClick = { },
Surface {
Row(
modifier = Modifier
.width(72.dp)
.padding(end = 8.dp),
.fillMaxWidth()
.padding(8.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Text(
text = shortName,
modifier = Modifier.fillMaxWidth(),
fontSize = MaterialTheme.typography.button.fontSize,
fontWeight = FontWeight.Normal,
textAlign = TextAlign.Center,
)
}
Column(
modifier = Modifier.weight(1f),
) {
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
Chip(
onClick = { },
modifier = Modifier
.width(72.dp)
.padding(end = 8.dp),
) {
Text(
text = longName,
fontSize = MaterialTheme.typography.button.fontSize,
)
Text(
text = lastMessageTime.orEmpty(),
text = shortName,
modifier = Modifier.fillMaxWidth(),
fontSize = MaterialTheme.typography.button.fontSize,
fontWeight = FontWeight.Normal,
textAlign = TextAlign.Center,
)
}
Row(
modifier = Modifier
.fillMaxWidth()
.padding(top = 8.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
Column(
modifier = Modifier.weight(1f),
) {
Text(
text = lastMessageText.orEmpty(),
modifier = Modifier.weight(1f),
color = MaterialTheme.colors.onSurface,
overflow = TextOverflow.Ellipsis,
maxLines = 2,
)
AnimatedVisibility(visible = isMuted) {
Icon(
imageVector = ImageVector.vectorResource(id = R.drawable.ic_twotone_volume_off_24),
contentDescription = null,
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
) {
Text(
text = longName,
)
Text(
text = lastMessageTime.orEmpty(),
color = MaterialTheme.colors.onSurface,
fontSize = MaterialTheme.typography.button.fontSize,
)
}
AnimatedVisibility(visible = unreadCount > 0) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(top = 8.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
) {
Text(
text = unreadCount.toString(),
modifier = Modifier
.background(MaterialTheme.colors.primary, shape = CircleShape)
.padding(horizontal = 6.dp, vertical = 3.dp),
color = MaterialTheme.colors.onPrimary,
style = MaterialTheme.typography.caption,
text = lastMessageText.orEmpty(),
modifier = Modifier.weight(1f),
color = MaterialTheme.colors.onSurface,
fontSize = MaterialTheme.typography.button.fontSize,
overflow = TextOverflow.Ellipsis,
maxLines = 2,
)
AnimatedVisibility(visible = isMuted) {
Icon(
imageVector = ImageVector.vectorResource(id = R.drawable.ic_twotone_volume_off_24),
contentDescription = null,
)
}
AnimatedVisibility(visible = unreadCount > 0) {
Text(
text = unreadCount.toString(),
modifier = Modifier
.background(MaterialTheme.colors.primary, shape = CircleShape)
.padding(horizontal = 6.dp, vertical = 3.dp),
color = MaterialTheme.colors.onPrimary,
style = MaterialTheme.typography.caption,
)
}
}
}
}