Displays % of uptime in relay settings

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/common/BasicRelaySetupInfoClickableRow.kt

@@ -104,19 +104,14 @@ fun BasicRelaySetupInfoClickableRow(
 
                 UsedBy(item, accountViewModel, nav)
 
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = ReactionRowHeightChatMaxWidth,
-                ) {
                 RelayStatusRow(
                     item = item,
                     onClick = onClick,
-                        modifier = Modifier.weight(1f),
+                    modifier = ReactionRowHeightChatMaxWidth,
                     accountViewModel = accountViewModel,
                 )
             }
         }
-        }
 
         HorizontalDivider(thickness = DividerThickness)
     }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/common/RelayStatusRow.kt

@@ -20,8 +20,11 @@
  */
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.common
 
+import android.R.attr.onClick
 import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.DeleteSweep
 import androidx.compose.material.icons.filled.Download
@@ -31,13 +34,18 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.LocalCache.users
 import com.vitorpamplona.amethyst.service.countToHumanReadable
 import com.vitorpamplona.amethyst.service.countToHumanReadableBytes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.mockAccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.Font12SP
 import com.vitorpamplona.amethyst.ui.theme.HalfStartPadding
@@ -46,6 +54,35 @@ import com.vitorpamplona.amethyst.ui.theme.allGoodColor
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.redColorOnSecondSurface
 import com.vitorpamplona.amethyst.ui.theme.warningColor
+import com.vitorpamplona.quartz.nip01Core.relay.client.stats.RelayStat
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.normalizeRelayUrl
+
+@Composable
+@Preview
+fun RelayStatusRowPreview() {
+    RelayStatusRow(
+        BasicRelaySetupInfo(
+            "nos.lol".normalizeRelayUrl(),
+            relayStat =
+                RelayStat(
+                    receivedBytes = 10000,
+                    sentBytes = 10000,
+                    spamCounter = 3,
+                    errorCounter = 4,
+                    pingInMs = 300,
+                    compression = true,
+                    connectionTentatives = 20,
+                    connectionCompleted = 10,
+                ),
+            paidRelay = true,
+            forcesTor = true,
+            users = listOf(),
+        ),
+        onClick = {},
+        modifier = Modifier,
+        accountViewModel = mockAccountViewModel(),
+    )
+}
 
 @Composable
 fun RelayStatusRow(
@@ -54,9 +91,14 @@ fun RelayStatusRow(
     modifier: Modifier,
     accountViewModel: AccountViewModel,
 ) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceEvenly,
+        modifier = modifier,
+    ) {
         Row(
             modifier =
-            modifier.pointerInput(Unit) {
+                Modifier.weight(1f).pointerInput(Unit) {
                     detectTapGestures(
                         onTap = {
                             onClick()
@@ -88,7 +130,7 @@ fun RelayStatusRow(
 
         Row(
             modifier =
-            modifier.pointerInput(Unit) {
+                Modifier.weight(1f).pointerInput(Unit) {
                     detectTapGestures(
                         onTap = {
                             onClick()
@@ -120,7 +162,7 @@ fun RelayStatusRow(
 
         Row(
             modifier =
-            modifier.pointerInput(Unit) {
+                Modifier.weight(1.3f).pointerInput(Unit) {
                     detectTapGestures(
                         onTap = {
                             onClick()
@@ -161,7 +203,7 @@ fun RelayStatusRow(
 
         Row(
             modifier =
-            modifier.pointerInput(Unit) {
+                Modifier.weight(0.9f).padding(end = 5.dp).pointerInput(Unit) {
                     detectTapGestures(
                         onTap = {
                             onClick()
@@ -174,6 +216,7 @@ fun RelayStatusRow(
                         },
                     )
                 },
+            horizontalArrangement = Arrangement.End,
         ) {
             Icon(
                 imageVector = Icons.Default.DeleteSweep,
@@ -195,4 +238,5 @@ fun RelayStatusRow(
                 color = MaterialTheme.colorScheme.placeholderText,
             )
         }
+    }
 }

amethyst/src/main/res/values/strings.xml

@@ -1744,5 +1744,5 @@
     <string name="following_accounts">Following %1$d accounts…</string>
     <string name="import_follows_tips">"Enter the profile of a friend or community leader. You can use their npub, NIP-05 address, or a Namecoin name like alice@example.bit or id/alice for blockchain-verified identities."</string>
     <string name="select_all">Select All</string>
-    <string name="uptime">%1$d% uptime</string>
+    <string name="uptime">%1$d%% uptime</string>
 </resources>