fix (#1647): Satellite icon sizing

pull/1804/head
James Rich 2025-04-29 15:45:31 -05:00 zatwierdzone przez GitHub
rodzic 09e795540e
commit ace756b96a
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
2 zmienionych plików z 17 dodań i 14 usunięć

Wyświetl plik

@ -17,6 +17,7 @@
package com.geeksville.mesh.ui.components
import androidx.compose.foundation.layout.Column
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
@ -60,18 +61,20 @@ fun SignalInfo(
if (node.hopsAway != 0) add(hopsString)
}.joinToString(" ")
}
if (text.isNotEmpty()) {
Text(
modifier = modifier,
text = text,
color = MaterialTheme.colors.onSurface,
fontSize = MaterialTheme.typography.button.fontSize
)
}
/* We only know the Signal Quality from direct nodes aka 0 hop. */
if (node.hopsAway <= 0) {
if (node.snr < MAX_VALID_SNR && node.rssi < MAX_VALID_RSSI) {
NodeSignalQuality(node.snr, node.rssi)
Column {
if (text.isNotEmpty()) {
Text(
modifier = modifier,
text = text,
color = MaterialTheme.colors.onSurface,
fontSize = MaterialTheme.typography.caption.fontSize
)
}
/* We only know the Signal Quality from direct nodes aka 0 hop. */
if (node.hopsAway <= 0) {
if (node.snr < MAX_VALID_SNR && node.rssi < MAX_VALID_RSSI) {
NodeSignalQuality(node.snr, node.rssi)
}
}
}
}

Wyświetl plik

@ -19,7 +19,7 @@ package com.geeksville.mesh.ui.compose
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.size
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
@ -44,7 +44,7 @@ fun SatelliteCountInfo(
horizontalArrangement = Arrangement.spacedBy(4.dp)
) {
Icon(
modifier = Modifier.height(18.dp),
modifier = Modifier.size(18.dp),
imageVector = ImageVector.vectorResource(id = R.drawable.ic_satellite),
contentDescription = null,
tint = MaterialTheme.colors.onSurface,