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 NodeDetails to Metrics (#1222)

Browse source 
* Synced the string used for ChUtil and AirUtilTX in the NodeInfo and Device Metrics.

* Refactored NodeDetails to Metrics.

* Added string resources for "Hops Away".
This commit is contained in:
Robert-0410 2024-09-08 03:36:44 -07:00 • committed by GitHub
parent d788195340
commit 2c426d470c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 51 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/geeksville/mesh/ui/components/CustomCharts.kt
View file

@ -116,7 +116,7 @@ fun EnvironmentMetricsScreen(telemetries: List<Telemetry>) {
@Composable
private fun DeviceMetricsChart(modifier: Modifier = Modifier, telemetries: List<Telemetry>) {
ChartHeader(amount = telemetries.size, title = stringResource(R.string.device_metrics))
ChartHeader(amount = telemetries.size)
if (telemetries.isEmpty())
return
@ -205,7 +205,7 @@ private fun DeviceMetricsChart(modifier: Modifier = Modifier, telemetries: List<
@Composable
private fun EnvironmentMetricsChart(modifier: Modifier = Modifier, telemetries: List<Telemetry>) {
ChartHeader(amount = telemetries.size, title = stringResource(R.string.environment_metrics))
ChartHeader(amount = telemetries.size)
if (telemetries.isEmpty())
return
@ -406,10 +406,8 @@ private fun DeviceMetricsCard(telemetry: Telemetry) {
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween
) {
val text = "%s %.2f%% %s %.2f%%".format(
stringResource(R.string.channel_utilization),
val text = stringResource(R.string.channel_air_util).format(
deviceMetrics.channelUtilization,
stringResource(R.string.air_utilization),
deviceMetrics.airUtilTx
)
Text(
@ -493,14 +491,14 @@ private fun EnvironmentMetricsCard(telemetry: Telemetry) {
}
@Composable
private fun ChartHeader(amount: Int, title: String) {
private fun ChartHeader(amount: Int) {
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = "$amount $title",
text = "$amount ${stringResource(R.string.logs)}",
modifier = Modifier.wrapContentWidth(),
style = TextStyle(fontWeight = FontWeight.Bold),
fontSize = MaterialTheme.typography.button.fontSize