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

Refactor: Centralized the blue used in both the Env and Pow metrics in CommonCharts.kt.

pull/1597/head
robert 2025-02-19 11:13:20 -08:00
rodzic ba28555d1d
commit 2725a2965a
3 zmienionych plików z 5 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
app/src/main/java/com/geeksville/mesh/ui/components/CommonCharts.kt
Wyświetl plik

@ -73,6 +73,7 @@ object CommonCharts {
const val LINE_LIMIT = 4 const val LINE_LIMIT = 4
const val TEXT_PAINT_ALPHA = 192 const val TEXT_PAINT_ALPHA = 192
const val MAX_PERCENT_VALUE = 100f const val MAX_PERCENT_VALUE = 100f
val INFANTRY_BLUE = Color(75, 119, 190)
} }
private const val LINE_ON = 10f private const val LINE_ON = 10f

3
app/src/main/java/com/geeksville/mesh/ui/components/EnvironmentMetrics.kt
Wyświetl plik

@ -65,10 +65,11 @@ import com.geeksville.mesh.model.TimeFrame
import com.geeksville.mesh.ui.components.CommonCharts.X_AXIS_SPACING import com.geeksville.mesh.ui.components.CommonCharts.X_AXIS_SPACING
import com.geeksville.mesh.ui.components.CommonCharts.MS_PER_SEC import com.geeksville.mesh.ui.components.CommonCharts.MS_PER_SEC
import com.geeksville.mesh.ui.components.CommonCharts.DATE_TIME_FORMAT import com.geeksville.mesh.ui.components.CommonCharts.DATE_TIME_FORMAT
import com.geeksville.mesh.ui.components.CommonCharts.INFANTRY_BLUE
private enum class Environment(val color: Color) { private enum class Environment(val color: Color) {
TEMPERATURE(Color.Red), TEMPERATURE(Color.Red),
HUMIDITY(Color(75, 119, 190)), HUMIDITY(INFANTRY_BLUE),
IAQ(Color.Green) IAQ(Color.Green)
} }
private val LEGEND_DATA = listOf( private val LEGEND_DATA = listOf(

3
app/src/main/java/com/geeksville/mesh/ui/components/PowerMetrics.kt
Wyświetl plik

@ -64,12 +64,13 @@ import com.geeksville.mesh.model.MetricsViewModel
import com.geeksville.mesh.model.TimeFrame import com.geeksville.mesh.model.TimeFrame
import com.geeksville.mesh.ui.components.CommonCharts.MS_PER_SEC import com.geeksville.mesh.ui.components.CommonCharts.MS_PER_SEC
import com.geeksville.mesh.ui.components.CommonCharts.DATE_TIME_FORMAT import com.geeksville.mesh.ui.components.CommonCharts.DATE_TIME_FORMAT
import com.geeksville.mesh.ui.components.CommonCharts.INFANTRY_BLUE
import com.geeksville.mesh.util.GraphUtil import com.geeksville.mesh.util.GraphUtil
import com.geeksville.mesh.util.GraphUtil.createPath import com.geeksville.mesh.util.GraphUtil.createPath
@Suppress("MagicNumber") @Suppress("MagicNumber")
private enum class Power(val color: Color, val min: Float, val max: Float) { private enum class Power(val color: Color, val min: Float, val max: Float) {
CURRENT(Color(75, 119, 190), -500f, 500f), CURRENT(INFANTRY_BLUE, -500f, 500f),
VOLTAGE(Color.Red, 0f, 20f); VOLTAGE(Color.Red, 0f, 20f);
/** /**
* Difference between the metrics `max` and `min` values. * Difference between the metrics `max` and `min` values.