feat(connections): Connecting state refactor (#3722)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>

feature/node/src/main/kotlin/org/meshtastic/feature/node/component/NodeItem.kt

@@ -49,6 +49,7 @@ import org.jetbrains.compose.resources.stringResource
 import org.meshtastic.core.database.model.Node
 import org.meshtastic.core.database.model.isUnmessageableRole
 import org.meshtastic.core.model.util.toDistanceString
+import org.meshtastic.core.service.ConnectionState
 import org.meshtastic.core.strings.Res
 import org.meshtastic.core.strings.elevation_suffix
 import org.meshtastic.core.strings.unknown_username
@@ -72,7 +73,7 @@ fun NodeItem(
     onClick: () -> Unit = {},
     onLongClick: (() -> Unit)? = null,
     currentTimeMillis: Long,
-    isConnected: Boolean = false,
+    connectionState: ConnectionState,
 ) {
     val isFavorite = remember(thatNode) { thatNode.isFavorite }
     val isIgnored = thatNode.isIgnored
@@ -140,7 +141,7 @@ fun NodeItem(
                     isThisNode = isThisNode,
                     isFavorite = isFavorite,
                     isUnmessageable = unmessageable,
-                    isConnected = isConnected,
+                    connectionState = connectionState,
                 )
             }
 
@@ -221,7 +222,14 @@ fun NodeInfoSimplePreview() {
     AppTheme {
         val thisNode = NodePreviewParameterProvider().values.first()
         val thatNode = NodePreviewParameterProvider().values.last()
-        NodeItem(thisNode = thisNode, thatNode = thatNode, 0, true, currentTimeMillis = System.currentTimeMillis())
+        NodeItem(
+            thisNode = thisNode,
+            thatNode = thatNode,
+            0,
+            true,
+            currentTimeMillis = System.currentTimeMillis(),
+            connectionState = ConnectionState.Connected,
+        )
     }
 }
 
@@ -236,6 +244,7 @@ fun NodeInfoPreview(@PreviewParameter(NodePreviewParameterProvider::class) thatN
             distanceUnits = 1,
             tempInFahrenheit = true,
             currentTimeMillis = System.currentTimeMillis(),
+            connectionState = ConnectionState.Connected,
         )
     }
 }

feature/node/src/main/kotlin/org/meshtastic/feature/node/component/NodeStatusIcons.kt

@@ -23,8 +23,10 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.NoCell
 import androidx.compose.material.icons.rounded.Star
+import androidx.compose.material.icons.twotone.Cloud
 import androidx.compose.material.icons.twotone.CloudDone
 import androidx.compose.material.icons.twotone.CloudOff
+import androidx.compose.material.icons.twotone.CloudSync
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -40,21 +42,29 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.jetbrains.compose.resources.stringResource
+import org.meshtastic.core.service.ConnectionState
 import org.meshtastic.core.strings.Res
 import org.meshtastic.core.strings.connected
+import org.meshtastic.core.strings.connecting
+import org.meshtastic.core.strings.device_sleeping
 import org.meshtastic.core.strings.disconnected
 import org.meshtastic.core.strings.favorite
-import org.meshtastic.core.strings.not_connected
 import org.meshtastic.core.strings.unmessageable
 import org.meshtastic.core.strings.unmonitored_or_infrastructure
 import org.meshtastic.core.ui.theme.StatusColors.StatusGreen
+import org.meshtastic.core.ui.theme.StatusColors.StatusOrange
 import org.meshtastic.core.ui.theme.StatusColors.StatusRed
 import org.meshtastic.core.ui.theme.StatusColors.StatusYellow
 
 @Suppress("LongMethod")
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun NodeStatusIcons(isThisNode: Boolean, isUnmessageable: Boolean, isFavorite: Boolean, isConnected: Boolean) {
+fun NodeStatusIcons(
+    isThisNode: Boolean,
+    isUnmessageable: Boolean,
+    isFavorite: Boolean,
+    connectionState: ConnectionState,
+) {
     Row(modifier = Modifier.padding(4.dp)) {
         if (isThisNode) {
             TooltipBox(
@@ -63,10 +73,11 @@ fun NodeStatusIcons(isThisNode: Boolean, isUnmessageable: Boolean, isFavorite: B
                     PlainTooltip {
                         Text(
                             stringResource(
-                                if (isConnected) {
-                                    Res.string.connected
-                                } else {
-                                    Res.string.disconnected
+                                when (connectionState) {
+                                    ConnectionState.Connected -> Res.string.connected
+                                    ConnectionState.Connecting -> Res.string.connecting
+                                    ConnectionState.Disconnected -> Res.string.disconnected
+                                    ConnectionState.DeviceSleep -> Res.string.device_sleeping
                                 },
                             ),
                         )
@@ -74,21 +85,39 @@ fun NodeStatusIcons(isThisNode: Boolean, isUnmessageable: Boolean, isFavorite: B
                 },
                 state = rememberTooltipState(),
             ) {
-                if (isConnected) {
-                    @Suppress("MagicNumber")
-                    Icon(
-                        imageVector = Icons.TwoTone.CloudDone,
-                        contentDescription = stringResource(Res.string.connected),
-                        modifier = Modifier.size(24.dp), // Smaller size for badge
-                        tint = MaterialTheme.colorScheme.StatusGreen,
-                    )
-                } else {
-                    Icon(
-                        imageVector = Icons.TwoTone.CloudOff,
-                        contentDescription = stringResource(Res.string.not_connected),
-                        modifier = Modifier.size(24.dp), // Smaller size for badge
-                        tint = MaterialTheme.colorScheme.StatusRed,
-                    )
+                when (connectionState) {
+                    ConnectionState.Connected -> {
+                        Icon(
+                            imageVector = Icons.TwoTone.CloudDone,
+                            contentDescription = stringResource(Res.string.connected),
+                            modifier = Modifier.size(24.dp), // Smaller size for badge
+                            tint = MaterialTheme.colorScheme.StatusGreen,
+                        )
+                    }
+                    ConnectionState.Connecting -> {
+                        Icon(
+                            imageVector = Icons.TwoTone.CloudSync,
+                            contentDescription = stringResource(Res.string.connecting),
+                            modifier = Modifier.size(24.dp), // Smaller size for badge
+                            tint = MaterialTheme.colorScheme.StatusOrange,
+                        )
+                    }
+                    ConnectionState.Disconnected -> {
+                        Icon(
+                            imageVector = Icons.TwoTone.CloudOff,
+                            contentDescription = stringResource(Res.string.connecting),
+                            modifier = Modifier.size(24.dp), // Smaller size for badge
+                            tint = MaterialTheme.colorScheme.StatusRed,
+                        )
+                    }
+                    ConnectionState.DeviceSleep -> {
+                        Icon(
+                            imageVector = Icons.TwoTone.Cloud,
+                            contentDescription = stringResource(Res.string.device_sleeping),
+                            modifier = Modifier.size(24.dp), // Smaller size for badge
+                            tint = MaterialTheme.colorScheme.StatusYellow,
+                        )
+                    }
                 }
             }
         }
@@ -130,5 +159,10 @@ fun NodeStatusIcons(isThisNode: Boolean, isUnmessageable: Boolean, isFavorite: B
 @Preview
 @Composable
 private fun StatusIconsPreview() {
-    NodeStatusIcons(isThisNode = true, isUnmessageable = true, isFavorite = true, isConnected = false)
+    NodeStatusIcons(
+        isThisNode = true,
+        isUnmessageable = true,
+        isFavorite = true,
+        connectionState = ConnectionState.Connected,
+    )
 }

feature/node/src/main/kotlin/org/meshtastic/feature/node/list/NodeListScreen.kt

@@ -140,7 +140,7 @@ fun NodeListScreen(
                 sharedContact = sharedContact,
                 modifier =
                 Modifier.animateFloatingActionButton(
-                    visible = !isScrollInProgress && connectionState == ConnectionState.CONNECTED && shareCapable,
+                    visible = !isScrollInProgress && connectionState == ConnectionState.Connected && shareCapable,
                     alignment = Alignment.BottomEnd,
                 ),
                 onSharedContactRequested = { contact -> viewModel.setSharedContactRequested(contact) },
@@ -217,7 +217,7 @@ fun NodeListScreen(
                             onClick = { navigateToNodeDetails(node.num) },
                             onLongClick = longClick,
                             currentTimeMillis = currentTimeMillis,
-                            isConnected = connectionState.isConnected(),
+                            connectionState = connectionState,
                         )
                         val isThisNode = remember(node) { ourNode?.num == node.num }
                         if (!isThisNode) {