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

Restructure node filters (#4020)

Browse source
This commit is contained in:
Phil Oliver 2025-12-16 17:09:49 -05:00 • committed by GitHub
parent 4b3ae721a0
commit a4148c952d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

45
feature/node/src/main/kotlin/org/meshtastic/feature/node/list/NodeListViewModel.kt
View file

@ -39,6 +39,7 @@ import org.meshtastic.feature.node.model.isEffectivelyUnmessageable
import org.meshtastic.proto.AdminProtos
import org.meshtastic.proto.ConfigProtos
import javax.inject.Inject
import kotlin.Boolean
@HiltViewModel
class NodeListViewModel
@ -66,21 +67,33 @@ constructor(
private val nodeSortOption = nodeFilterPreferences.nodeSortOption
private val _nodeFilterText = savedStateHandle.getStateFlow(KEY_FILTER_TEXT, "")
private val includeUnknown = nodeFilterPreferences.includeUnknown
private val excludeInfrastructure = nodeFilterPreferences.excludeInfrastructure
private val onlyOnline = nodeFilterPreferences.onlyOnline
private val onlyDirect = nodeFilterPreferences.onlyDirect
private val showIgnored = nodeFilterPreferences.showIgnored
private val filterToggles =
combine(
nodeFilterPreferences.includeUnknown,
nodeFilterPreferences.excludeInfrastructure,
nodeFilterPreferences.onlyOnline,
nodeFilterPreferences.onlyDirect,
nodeFilterPreferences.showIgnored,
) { includeUnknown, excludeInfrastructure, onlyOnline, onlyDirect, showIgnored ->
NodeFilterToggles(
includeUnknown = includeUnknown,
excludeInfrastructure = excludeInfrastructure,
onlyOnline = onlyOnline,
onlyDirect = onlyDirect,
showIgnored = showIgnored,
)
}
private val nodeFilter: Flow<NodeFilterState> =
combine(_nodeFilterText, includeUnknown, excludeInfrastructure, onlyOnline, onlyDirect, showIgnored) { values ->
combine(_nodeFilterText, filterToggles) { filterText, filterToggles ->
NodeFilterState(
filterText = values[0] as String,
includeUnknown = values[1] as Boolean,
excludeInfrastructure = values[2] as Boolean,
onlyOnline = values[3] as Boolean,
onlyDirect = values[4] as Boolean,
showIgnored = values[5] as Boolean,
filterText = filterText,
includeUnknown = filterToggles.includeUnknown,
excludeInfrastructure = filterToggles.excludeInfrastructure,
onlyOnline = filterToggles.onlyOnline,
onlyDirect = filterToggles.onlyDirect,
showIgnored = filterToggles.showIgnored,
)
}
val nodesUiState: StateFlow<NodesUiState> =
@ -170,3 +183,11 @@ data class NodeFilterState(
val onlyDirect: Boolean = false,
val showIgnored: Boolean = false,
)
data class NodeFilterToggles(
val includeUnknown: Boolean = false,
val excludeInfrastructure: Boolean = false,
val onlyOnline: Boolean = false,
val onlyDirect: Boolean = false,
val showIgnored: Boolean = false,
)