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

Display power plug icon when no battery #99

Browse source
This commit is contained in:
Ludovic Goix 2020-07-16 08:50:47 -04:00
parent 75be43b3c5
commit 4a6d88039b
2 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
View file

@ -6,6 +6,7 @@ import android.text.format.DateFormat
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
@ -31,6 +32,7 @@ class UsersFragment : ScreenFragment("Users"), Logging {
val distance_view = itemView.distance_view
val batteryPctView = itemView.batteryPercentageView
val lastTime = itemView.lastConnectionView
val powerIcon = itemView.batteryIcon
}
private val nodesAdapter = object : RecyclerView.Adapter<ViewHolder>() {
@ -112,15 +114,7 @@ class UsersFragment : ScreenFragment("Users"), Logging {
holder.distance_view.visibility = View.INVISIBLE
}
val battery = n.batteryPctLevel
if (battery != null)
{
holder.batteryPctView.text = "$battery%"
}
else
{
holder.batteryPctView.text = "?"
}
renderBattery(n.batteryPctLevel, holder)
holder.lastTime.text = getLastTimeValue(n)
}
@ -134,14 +128,33 @@ class UsersFragment : ScreenFragment("Users"), Logging {
}
}
private fun getLastTimeValue(n: NodeInfo): String {
var lastTimeText: String = "?"
private fun renderBattery(
battery: Int?,
holder: ViewHolder
) {
val (image, text) = when (battery) {
null -> Pair(R.drawable.ic_battery_full_24, "?")
0 -> Pair(R.drawable.ic_power_plug_24, "")
else -> Pair(R.drawable.ic_battery_full_24, "$battery%")
}
holder.batteryPctView.text = text
holder.powerIcon.setImageDrawable(context?.let {
ContextCompat.getDrawable(
it,
image
)
})
}
private fun getLastTimeValue(n: NodeInfo): String {
var lastTimeText = "?"
val currentTime = (System.currentTimeMillis()/1000).toInt()
val threeDaysLong = 3 * 60*60*24
//if the lastSeen is too old
if((n.lastSeen<currentTime-threeDaysLong))
if (n.lastSeen < (currentTime - threeDaysLong))
return lastTimeText
try {