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: convert connectionState to StateFlow

Browse source
This commit is contained in:
andrekir 2024-11-12 09:08:08 -03:00
parent a980441fd1
commit cfdb245da2
8 changed files with 25 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

39
app/src/main/java/com/geeksville/mesh/ui/NodeItem.kt
View file

@ -1,9 +1,3 @@
@file:Suppress(
"LongMethod",
"MagicNumber",
"CyclomaticComplexMethod",
)
package com.geeksville.mesh.ui
import androidx.compose.animation.animateColorAsState
@ -58,8 +52,6 @@ import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig
import com.geeksville.mesh.MeshProtos
import com.geeksville.mesh.R
import com.geeksville.mesh.database.entity.NodeEntity
import com.geeksville.mesh.service.MeshService
import com.geeksville.mesh.service.MeshService.ConnectionState
import com.geeksville.mesh.ui.components.MenuItemAction
import com.geeksville.mesh.ui.components.NodeKeyStatusIcon
import com.geeksville.mesh.ui.components.NodeMenu
@ -71,6 +63,7 @@ import com.geeksville.mesh.ui.theme.AppTheme
import com.geeksville.mesh.util.metersIn
import com.geeksville.mesh.util.toDistanceString
@Suppress("LongMethod", "CyclomaticComplexMethod")
@OptIn(ExperimentalMaterialApi::class)
@Composable
fun NodeItem(
@ -84,10 +77,9 @@ fun NodeItem(
blinking: Boolean = false,
expanded: Boolean = false,
currentTimeMillis: Long,
connectionState: MeshService.ConnectionState? = ConnectionState.DISCONNECTED,
isConnected: Boolean = false,
) {
val isUnknownUser = thatNode.isUnknownUser
val unknownShortName = stringResource(id = R.string.unknown_node_short_name)
val isIgnored = ignoreIncomingList.contains(thatNode.num)
val longName = thatNode.user.longName.ifEmpty { stringResource(id = R.string.unknown_username) }
val isThisNode = thisNode?.num == thatNode.num
@ -101,28 +93,23 @@ fun NodeItem(
MeshProtos.HardwareModel.UNSET -> MeshProtos.HardwareModel.UNSET.name
else -> hwModel.name.replace('_', '-').replace('p', '.').lowercase()
}
val roleName = if (isUnknownUser) {
val roleName = if (thatNode.isUnknownUser) {
DeviceConfig.Role.UNRECOGNIZED.name
} else {
thatNode.user.role.name
}
val nodeId = thatNode.user.id.ifEmpty { "???" }
val highlight = Color(0x33FFFFFF)
val bgColor by animateColorAsState(
targetValue = if (blinking) highlight else Color.Transparent,
targetValue = if (blinking) Color(color = 0x33FFFFFF) else Color.Transparent,
animationSpec = repeatable(
iterations = 6,
animation = tween(
durationMillis = 250,
easing = FastOutSlowInEasing
),
animation = tween(durationMillis = 250, easing = FastOutSlowInEasing),
repeatMode = RepeatMode.Reverse
),
label = "blinking node"
)
val style = if (isUnknownUser) {
val style = if (thatNode.isUnknownUser) {
LocalTextStyle.current.copy(fontStyle = FontStyle.Italic)
} else {
LocalTextStyle.current
@ -179,7 +166,7 @@ fun NodeItem(
content = {
Text(
modifier = Modifier.fillMaxWidth(),
text = thatNode.user.shortName.ifEmpty { unknownShortName },
text = thatNode.user.shortName.ifEmpty { "???" },
fontWeight = FontWeight.Normal,
fontSize = MaterialTheme.typography.button.fontSize,
textDecoration = TextDecoration.LineThrough.takeIf {
@ -196,7 +183,7 @@ fun NodeItem(
onMenuItemAction = menuItemActionClicked,
expanded = menuExpanded,
onDismissRequest = { menuExpanded = false },
isConnected = connectionState == ConnectionState.CONNECTED,
isConnected = isConnected,
)
}
NodeKeyStatusIcon(
@ -208,11 +195,7 @@ fun NodeItem(
modifier = Modifier.weight(1f),
text = longName,
style = style,
textDecoration = TextDecoration.LineThrough.takeIf {
ignoreIncomingList.contains(
thatNode.num
)
},
textDecoration = TextDecoration.LineThrough.takeIf { isIgnored },
softWrap = true,
)
@ -322,7 +305,7 @@ fun NodeItem(
)
Text(
modifier = Modifier.weight(1f),
text = nodeId,
text = thatNode.user.id.ifEmpty { "???" },
textAlign = TextAlign.End,
fontSize = MaterialTheme.typography.button.fontSize,
style = style,