From 4e410622d80555be23c84bceff2d5ac6045c74fc Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Sun, 16 Jul 2023 03:46:54 -0500
Subject: [PATCH] feat: Honor radio's option to use Fahrenheit (#658)

---
 app/src/main/java/com/geeksville/mesh/NodeInfo.kt         | 5 +++--
 app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/NodeInfo.kt b/app/src/main/java/com/geeksville/mesh/NodeInfo.kt
index 1c752fbfd..f63b79872 100644
--- a/app/src/main/java/com/geeksville/mesh/NodeInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/NodeInfo.kt
@@ -174,8 +174,9 @@ data class NodeInfo(
     private fun envFormat(f: String, unit: String, env: Float?): String =
         if (env != null && env != 0f) String.format(f + unit, env) else ""
 
-    val envMetricStr
-        get() = envFormat("%.1f", "°C ", environmentMetrics?.temperature) +
+    fun envMetricStr(isFahrenheit: Boolean = false): String =
+        if (!isFahrenheit) envFormat("%.1f", "°C ", environmentMetrics?.temperature)
+        else envFormat("%.1f", "°F ", environmentMetrics?.temperature?.times(1.8f)?.plus(32)) +
                 envFormat("%.0f", "%% ", environmentMetrics?.relativeHumidity) +
                 envFormat("%.1f", "hPa ", environmentMetrics?.barometricPressure) +
                 envFormat("%.0f", "mΩ ", environmentMetrics?.gasResistance) +
diff --git a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
index 18bdb69f4..a7fd0ae3a 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
@@ -205,8 +205,9 @@ class UsersFragment : ScreenFragment("Users"), Logging {
 
             holder.lastTime.text = formatAgo(n.lastHeard)
 
-            if (n.envMetricStr.isNotEmpty()) {
-                holder.envMetrics.text = n.envMetricStr
+            val envMetrics = n.envMetricStr(model.module.telemetry.environmentDisplayFahrenheit)
+            if (envMetrics.isNotEmpty()) {
+                holder.envMetrics.text = envMetrics
                 holder.envMetrics.visibility = View.VISIBLE
             } else {
                 holder.envMetrics.visibility = View.GONE