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

refactor: Node detail work (#1836)

Browse source
This commit is contained in:
Robert-0410 2025-05-10 06:03:14 -07:00 • committed by GitHub
parent 6bb282f901
commit cd9167f19f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 96 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/src/main/java/com/geeksville/mesh/util/DistanceExtensions.kt
View file

@ -19,7 +19,7 @@ package com.geeksville.mesh.util
import android.icu.util.LocaleData
import android.icu.util.ULocale
import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig
import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig.DisplayUnits
import java.util.Locale
enum class DistanceUnit(
@ -27,23 +27,23 @@ enum class DistanceUnit(
val multiplier: Float,
val system: Int
) {
METER("m", multiplier = 1F, DisplayConfig.DisplayUnits.METRIC_VALUE),
KILOMETER("km", multiplier = 0.001F, DisplayConfig.DisplayUnits.METRIC_VALUE),
FOOT("ft", multiplier = 3.28084F, DisplayConfig.DisplayUnits.IMPERIAL_VALUE),
MILE("mi", multiplier = 0.000621371F, DisplayConfig.DisplayUnits.IMPERIAL_VALUE),
METER("m", multiplier = 1F, DisplayUnits.METRIC_VALUE),
KILOMETER("km", multiplier = 0.001F, DisplayUnits.METRIC_VALUE),
FOOT("ft", multiplier = 3.28084F, DisplayUnits.IMPERIAL_VALUE),
MILE("mi", multiplier = 0.000621371F, DisplayUnits.IMPERIAL_VALUE),
;
companion object {
fun getFromLocale(locale: Locale = Locale.getDefault()): DisplayConfig.DisplayUnits {
fun getFromLocale(locale: Locale = Locale.getDefault()): DisplayUnits {
return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
when (LocaleData.getMeasurementSystem(ULocale.forLocale(locale))) {
LocaleData.MeasurementSystem.SI -> DisplayConfig.DisplayUnits.METRIC
else -> DisplayConfig.DisplayUnits.IMPERIAL
LocaleData.MeasurementSystem.SI -> DisplayUnits.METRIC
else -> DisplayUnits.IMPERIAL
}
} else {
when (locale.country.uppercase(locale)) {
"US", "LR", "MM", "GB" -> DisplayConfig.DisplayUnits.IMPERIAL
else -> DisplayConfig.DisplayUnits.METRIC
"US", "LR", "MM", "GB" -> DisplayUnits.IMPERIAL
else -> DisplayUnits.METRIC
}
}
}
@ -54,9 +54,9 @@ fun Int.metersIn(unit: DistanceUnit): Float {
return this * unit.multiplier
}
fun Int.metersIn(system: DisplayConfig.DisplayUnits): Float {
fun Int.metersIn(system: DisplayUnits): Float {
val unit = when (system.number) {
DisplayConfig.DisplayUnits.IMPERIAL_VALUE -> DistanceUnit.FOOT
DisplayUnits.IMPERIAL_VALUE -> DistanceUnit.FOOT
else -> DistanceUnit.METER
}
return this.metersIn(unit)
@ -70,9 +70,9 @@ fun Float.toString(unit: DistanceUnit): String {
}.format(this, unit.symbol)
}
fun Float.toString(system: DisplayConfig.DisplayUnits): String {
fun Float.toString(system: DisplayUnits): String {
val unit = when (system.number) {
DisplayConfig.DisplayUnits.IMPERIAL_VALUE -> DistanceUnit.FOOT
DisplayUnits.IMPERIAL_VALUE -> DistanceUnit.FOOT
else -> DistanceUnit.METER
}
return this.toString(unit)
@ -80,8 +80,8 @@ fun Float.toString(system: DisplayConfig.DisplayUnits): String {
private const val KILOMETER_THRESHOLD = 1000
private const val MILE_THRESHOLD = 1609
fun Int.toDistanceString(system: DisplayConfig.DisplayUnits): String {
val unit = if (system.number == DisplayConfig.DisplayUnits.METRIC_VALUE) {
fun Int.toDistanceString(system: DisplayUnits): String {
val unit = if (system.number == DisplayUnits.METRIC_VALUE) {
if (this < KILOMETER_THRESHOLD) DistanceUnit.METER else DistanceUnit.KILOMETER
} else {
if (this < MILE_THRESHOLD) DistanceUnit.FOOT else DistanceUnit.MILE
@ -89,3 +89,9 @@ fun Int.toDistanceString(system: DisplayConfig.DisplayUnits): String {
val valueInUnit = this * unit.multiplier
return valueInUnit.toString(unit)
}
@Suppress("MagicNumber")
fun Float.toSpeedString() = when (DistanceUnit.getFromLocale()) {
DisplayUnits.METRIC -> "%.0f km/h".format(this * 3.6)
else -> "%.0f mph".format(this * 2.23694f)
}

46
app/src/main/java/com/geeksville/mesh/util/UnitConversions.kt Normal file
View file

@ -0,0 +1,46 @@
/*
* Copyright (c) 2025 Meshtastic LLC
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.geeksville.mesh.util
import kotlin.math.ln
object UnitConversions {
@Suppress("MagicNumber")
fun celsiusToFahrenheit(celsius: Float): Float {
return (celsius * 1.8F) + 32
}
fun Float.toTempString(isFahrenheit: Boolean) = if (isFahrenheit) {
val fahrenheit = celsiusToFahrenheit(this)
"%.0f°F".format(fahrenheit)
} else {
"%.0f°C".format(this)
}
/**
* Calculated the dew point based on the Magnus-Tetens approximation which is a widely used
* formula for calculating dew point temperature.
*/
@Suppress("MagicNumber")
fun calculateDewPoint(tempCelsius: Float, humidity: Float): Float {
val (a, b) = 17.27f to 237.7f
val alpha = (a * tempCelsius) / (b + tempCelsius) + ln(humidity / 100f)
return (b * alpha) / (a - alpha)
}
}