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)
}
}