mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'master' into remove-hints

pull/295/head
Kevin Hester 2021-11-18 02:02:06 +08:00 zatwierdzone przez GitHub
rodzic 0e20ec78db 4eb29fdf46
commit 2c50b9890a
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 6 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
Wyświetl plik

@ -1,5 +1,6 @@
package com.geeksville.mesh.ui package com.geeksville.mesh.ui
import android.graphics.Color
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -54,7 +55,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
private fun getShortDateTime(time: Date): String { private fun getShortDateTime(time: Date): String {
// return time if within 24 hours, otherwise date/time // 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) { if (System.currentTimeMillis() - time.time > one_day) {
return dateTimeFormat.format(time) return dateTimeFormat.format(time)
} else return timeFormat.format(time) } else return timeFormat.format(time)
@ -142,7 +143,8 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
val nodes = model.nodeDB.nodes.value!! val nodes = model.nodeDB.nodes.value!!
val node = nodes.get(msg.from) val node = nodes.get(msg.from)
// Determine if this is my message (originated on this device). // 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. // Set cardview offset and color.
val marginParams = holder.card.layoutParams as ViewGroup.MarginLayoutParams val marginParams = holder.card.layoutParams as ViewGroup.MarginLayoutParams
@ -180,7 +182,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
holder.username.text = user?.shortName ?: msg.from holder.username.text = user?.shortName ?: msg.from
} }
if (msg.errorMessage != null) { 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 holder.messageText.text = msg.errorMessage
} else { } else {
holder.messageText.text = msg.text holder.messageText.text = msg.text

2
app/src/main/res/values-night/colors.xml
Wyświetl plik

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