Manages the pool state without having to loop through relays, saving some milliseconds of processing.

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -704,7 +704,7 @@ class Account(
     fun computeRelayListToBroadcast(event: Event): Set<NormalizedRelayUrl> {
         if (event is MetadataEvent || event is AdvertisedRelayListEvent) {
             // everywhere
-            return followPlusAllMineWithIndex.flow.value + client.relayStatusFlow().value.available
+            return followPlusAllMineWithIndex.flow.value + client.availableRelaysFlow().value
         }
         if (event is GiftWrapEvent) {
             val receiver = event.recipientPubKey()
@@ -904,7 +904,7 @@ class Account(
     }
 
     fun sendLiterallyEverywhere(event: Event) {
-        client.send(event, followPlusAllMineWithIndex.flow.value + client.relayStatusFlow().value.available)
+        client.send(event, followPlusAllMineWithIndex.flow.value + client.availableRelaysFlow().value)
         cache.justConsumeMyOwnEvent(event)
     }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/follows/AccountFollowsLoaderSubAssembler.kt

@@ -154,7 +154,7 @@ class AccountFollowsLoaderSubAssembler(
 
         println("AccountFollowNeeds ${users.size}")
 
-        val connectedRelays = client.relayStatusFlow().value.connected
+        val connectedRelays = client.connectedRelaysFlow().value
 
         val perRelay = pickRelaysToLoadUsers(users, accounts, connectedRelays, failureTracker.cannotConnectRelays, hasTried)
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/UserOutboxFinderSubAssembler.kt

@@ -96,7 +96,7 @@ class UserOutboxFinderSubAssembler(
         if (noOutboxList.isEmpty()) return null
 
         val accounts = keys.mapTo(mutableSetOf()) { it.account }
-        val connectedRelays = client.relayStatusFlow().value.connected
+        val connectedRelays = client.connectedRelaysFlow().value
 
         val perRelayKeysBoth =
             pickRelaysToLoadUsers(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt

@@ -112,11 +112,11 @@ import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.Font18SP
 import com.vitorpamplona.amethyst.ui.theme.IconRowModifier
 import com.vitorpamplona.amethyst.ui.theme.IconRowTextModifier
-import com.vitorpamplona.amethyst.ui.theme.Size16dp
 import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size22Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size26Modifier
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.Width16Space
 import com.vitorpamplona.amethyst.ui.theme.bannerModifier
 import com.vitorpamplona.amethyst.ui.theme.drawerSpacing
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -124,7 +124,8 @@ import com.vitorpamplona.amethyst.ui.theme.profileContentHeaderModifier
 import com.vitorpamplona.quartz.nip01Core.core.Address
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.ImmutableListOfLists
-import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayPool
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
 
 @Composable
 fun DrawerContent(
@@ -537,40 +538,6 @@ fun ListContent(
     }
 }
 
-@Composable
-private fun RelayStatus(accountViewModel: AccountViewModel) {
-    val connectedRelaysText by accountViewModel.account.client
-        .relayStatusFlow()
-        .collectAsStateWithLifecycle()
-
-    RenderRelayStatus(connectedRelaysText)
-}
-
-@Composable
-private fun RenderRelayStatus(relayPool: RelayPool.RelayPoolStatus) {
-    val text by
-        remember(relayPool) { derivedStateOf { "${relayPool.connected.size}/${relayPool.available.size}" } }
-
-    val placeHolder = MaterialTheme.colorScheme.placeholderText
-
-    val color by
-        remember(relayPool) {
-            derivedStateOf {
-                if (relayPool.isConnected) {
-                    placeHolder
-                } else {
-                    Color.Red
-                }
-            }
-        }
-
-    Text(
-        text = text,
-        color = color,
-        style = MaterialTheme.typography.titleMedium,
-    )
-}
-
 @Composable
 fun NavigationRow(
     title: Int,
@@ -691,35 +658,55 @@ fun IconRowRelays(
         modifier =
             Modifier
                 .fillMaxWidth()
-                .clickable { onClick() },
+                .padding(vertical = 15.dp, horizontal = 25.dp)
+                .clickable(onClick = onClick),
+        verticalAlignment = Alignment.CenterVertically,
     ) {
-        Row(
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(vertical = 15.dp, horizontal = 25.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Icon(
-                painter = painterRes(R.drawable.relays, 4),
-                contentDescription = stringRes(R.string.relay_setup),
-                modifier = Modifier.size(22.dp),
-                tint = MaterialTheme.colorScheme.onSurface,
-            )
+        Icon(
+            painter = painterRes(R.drawable.relays, 4),
+            contentDescription = stringRes(R.string.relay_setup),
+            modifier = Size22Modifier,
+            tint = MaterialTheme.colorScheme.onSurface,
+        )
 
-            Text(
-                modifier = Modifier.padding(start = 16.dp),
-                text = stringRes(id = R.string.relay_setup),
-                fontSize = 18.sp,
-            )
+        Text(
+            modifier = IconRowTextModifier,
+            text = stringRes(id = R.string.relay_setup),
+            fontSize = Font18SP,
+        )
 
-            Spacer(modifier = Modifier.width(Size16dp))
+        Spacer(modifier = Width16Space)
 
-            RelayStatus(accountViewModel = accountViewModel)
-        }
+        RelayStatus(accountViewModel)
     }
 }
 
+class PoolStatus(
+    val share: String,
+    val isConnected: Boolean,
+)
+
+@Composable
+private fun RelayStatus(accountViewModel: AccountViewModel) {
+    val statusCounterFlow: Flow<PoolStatus> =
+        remember(accountViewModel) {
+            combine(
+                accountViewModel.account.client.connectedRelaysFlow(),
+                accountViewModel.account.client.availableRelaysFlow(),
+            ) { connected, available ->
+                PoolStatus("${connected.size}/${available.size}", connected.isNotEmpty())
+            }
+        }
+
+    val relayPool by statusCounterFlow.collectAsStateWithLifecycle(PoolStatus("", false))
+
+    Text(
+        text = relayPool.share,
+        color = if (relayPool.isConnected) MaterialTheme.colorScheme.placeholderText else Color.Red,
+        style = MaterialTheme.typography.titleMedium,
+    )
+}
+
 @Composable
 fun BottomContent(
     user: User,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/connected/ConnectedRelayListViewModel.kt

@@ -50,8 +50,8 @@ class ConnectedRelayListViewModel : BasicRelaySetupInfoModel() {
 
     override fun getRelayList(): List<NormalizedRelayUrl> =
         account.client
-            .relayStatusFlow()
-            .value.available
+            .availableRelaysFlow()
+            .value
             .sorted()
 
     override suspend fun saveRelayList(urlList: List<NormalizedRelayUrl>) {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt

@@ -255,6 +255,8 @@ val drawerSpacing = Modifier.padding(top = Size10dp, start = Size25dp, end = Siz
 val IconRowTextModifier = Modifier.padding(start = 16.dp)
 val IconRowModifier = Modifier.fillMaxWidth().padding(vertical = 15.dp, horizontal = 25.dp)
 
+val Width16Space = Modifier.width(Size16dp)
+
 val emptyLineItemModifier = Modifier.height(Size75dp).fillMaxWidth()
 
 val imageHeaderBannerSize = Modifier.fillMaxWidth().height(150.dp)