mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-02 03:42:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #296 from andrekir/MessagesFragment

Browse Source 
Fix: MessagesFragment layout
This commit is contained in:
Kevin Hester
2021-11-18 02:01:28 +08:00
committed by GitHub
parent 781b972c71 f4c754e599
commit 4eb29fdf46
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

2
app/src/main/res/values-night/colors.xml
View File

@@ -4,7 +4,7 @@
<color name="colorPrimary">#141414</color>
<color name="colorPrimaryDark">#141414</color>
<color name="colorMsg">#212121</color>
<color name="colorMyMsg">#212121</color>
<color name="colorMyMsg">#28463C</color>
<color name="colorDebugBackground">#141414</color>
<color name="colorAdvancedBackground">#141414</color>
<color name="colorIconTint">#FFFFFF</color>