mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-04 14:13:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix: MessagesFragment layout

Browse Source 
- fix our messages right margin; received left margin (compare "msg.from" to "^local" to "determine if this is my message (originated on this device)";
- night/colors.xml: changed colorMyMsg to #28463C; (colorMsg & colorMyMsg were the same on Dark theme);
- fix val one_day typo (= 86400000 ms/day);
- if errorMessage --> setCardBackgroundColor(Color.RED).
This commit is contained in:
andrekir
2021-09-07 22:17:14 -03:00
parent 781b972c71
commit f4c754e599
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
View File

@@ -1,5 +1,6 @@
package com.geeksville.mesh.ui
import android.graphics.Color
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@@ -54,7 +55,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
private fun getShortDateTime(time: Date): String {
// return time if within 24 hours, otherwise date/time
val one_day = 60 * 60 * 24 * 100L
val one_day = 60 * 60 * 24 * 1000
if (System.currentTimeMillis() - time.time > one_day) {
return dateTimeFormat.format(time)
} else return timeFormat.format(time)
@@ -142,7 +143,8 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
val nodes = model.nodeDB.nodes.value!!
val node = nodes.get(msg.from)
// Determine if this is my message (originated on this device).
val isMe = model.myNodeInfo.value?.myNodeNum == node?.num
// val isMe = model.myNodeInfo.value?.myNodeNum == node?.num
val isMe = msg.from == "^local"
// Set cardview offset and color.
val marginParams = holder.card.layoutParams as ViewGroup.MarginLayoutParams
@@ -180,7 +182,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
holder.username.text = user?.shortName ?: msg.from
}
if (msg.errorMessage != null) {
// FIXME, set the style to show a red error message
context?.let { holder.card.setCardBackgroundColor(Color.RED) }
holder.messageText.text = msg.errorMessage
} else {
holder.messageText.text = msg.text