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

18
app/src/main/java/com/geeksville/mesh/model/NodeDetailsViewModel.kt → app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt
View file

@ -16,27 +16,27 @@ import kotlinx.coroutines.launch
import javax.inject.Inject
import kotlin.enums.EnumEntries
enum class NodeDetailPage(
enum class MetricsPage(
@StringRes val titleResId: Int,
@DrawableRes val drawableResId: Int,
) {
DEVICE(R.string.device_metrics, R.drawable.baseline_charging_station_24),
ENVIRONMENT(R.string.environment_metrics, R.drawable.baseline_thermostat_24),
DEVICE(R.string.device, R.drawable.baseline_charging_station_24),
ENVIRONMENT(R.string.environment, R.drawable.baseline_thermostat_24),
}
data class NodeDetailsState(
val pages: EnumEntries<NodeDetailPage> = NodeDetailPage.entries,
data class MetricsState(
val pages: EnumEntries<MetricsPage> = MetricsPage.entries,
val isLoading: Boolean = false,
val deviceMetrics: List<Telemetry> = emptyList(),
val environmentMetrics: List<Telemetry> = emptyList(),
) {
companion object {
val Empty = NodeDetailsState()
val Empty = MetricsState()
}
}
@HiltViewModel
class NodeDetailsViewModel @Inject constructor(
class MetricsViewModel @Inject constructor(
val nodeDB: NodeDB,
private val meshLogRepository: MeshLogRepository
) : ViewModel() {
@ -50,7 +50,7 @@ class NodeDetailsViewModel @Inject constructor(
_deviceMetrics,
_environmentMetrics,
) { isLoading, device, environment ->
NodeDetailsState(
MetricsState(
isLoading = isLoading,
deviceMetrics = device,
environmentMetrics = environment,
@ -58,7 +58,7 @@ class NodeDetailsViewModel @Inject constructor(
}.stateIn(
scope = viewModelScope,
started = WhileSubscribed(5_000),
initialValue = NodeDetailsState.Empty,
initialValue = MetricsState.Empty,
)
/**