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

Expanding node info cards (#1144)

Browse source
This commit is contained in:
James Rich 2024-07-28 05:04:50 -05:00 • committed by GitHub
parent ed17ae0734
commit fc2559f5f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 268 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/com/geeksville/mesh/model/UIState.kt
View file

@ -12,16 +12,16 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.asLiveData
import androidx.lifecycle.viewModelScope
import com.geeksville.mesh.android.Logging
import com.geeksville.mesh.*
import com.geeksville.mesh.ChannelProtos.ChannelSettings
import com.geeksville.mesh.ConfigProtos.Config
import com.geeksville.mesh.database.MeshLogRepository
import com.geeksville.mesh.database.QuickChatActionRepository
import com.geeksville.mesh.database.entity.QuickChatAction
import com.geeksville.mesh.LocalOnlyProtos.LocalConfig
import com.geeksville.mesh.LocalOnlyProtos.LocalModuleConfig
import com.geeksville.mesh.android.Logging
import com.geeksville.mesh.database.MeshLogRepository
import com.geeksville.mesh.database.PacketRepository
import com.geeksville.mesh.database.QuickChatActionRepository
import com.geeksville.mesh.database.entity.QuickChatAction
import com.geeksville.mesh.repository.datastore.RadioConfigRepository
import com.geeksville.mesh.repository.radio.RadioInterfaceService
import com.geeksville.mesh.service.MeshService
@ -29,10 +29,10 @@ import com.geeksville.mesh.util.positionToMeter
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribed
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flatMapLatest
@ -102,10 +102,11 @@ data class NodesUiState(
val sort: NodeSortOption = NodeSortOption.LAST_HEARD,
val filter: String = "",
val includeUnknown: Boolean = false,
val gpsFormat:Int = 0,
val distanceUnits:Int = 0,
val tempInFahrenheit:Boolean = false,
val gpsFormat: Int = 0,
val distanceUnits: Int = 0,
val tempInFahrenheit: Boolean = false,
val ignoreIncomingList: List<Int> = emptyList(),
val showDetails: Boolean = false,
) {
companion object {
val Empty = NodesUiState()
@ -151,11 +152,16 @@ class UIViewModel @Inject constructor(
private val nodeFilterText = MutableStateFlow("")
private val nodeSortOption = MutableStateFlow(NodeSortOption.LAST_HEARD)
private val includeUnknown = MutableStateFlow(false)
private val showDetails = MutableStateFlow(false)
fun setSortOption(sort: NodeSortOption) {
nodeSortOption.value = sort
}
fun toggleShowDetails() {
showDetails.value = !showDetails.value
}
fun toggleIncludeUnknown() {
includeUnknown.value = !includeUnknown.value
}
@ -164,8 +170,9 @@ class UIViewModel @Inject constructor(
nodeFilterText,
nodeSortOption,
includeUnknown,
showDetails,
radioConfigRepository.deviceProfileFlow,
) { filter, sort, includeUnknown, profile ->
) { filter, sort, includeUnknown, showDetails, profile ->
NodesUiState(
sort = sort,
filter = filter,
@ -174,6 +181,7 @@ class UIViewModel @Inject constructor(
distanceUnits = profile.config.display.units.number,
tempInFahrenheit = profile.moduleConfig.telemetry.environmentDisplayFahrenheit,
ignoreIncomingList = profile.config.lora.ignoreIncomingList,
showDetails = showDetails,
)
}.stateIn(
scope = viewModelScope,