Fix relay icons when using complete ui

vitorpamplona · Aug 28, 2024 · 06f37ab · 06f37ab
1 parent efde14a
commit 06f37ab
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 27 deletions.
diff --git a/...main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoClickableRow.kt b/...main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoClickableRow.kt
@@ -65,6 +65,7 @@ fun BasicRelaySetupInfoClickableRow(
                 iconUrlFromRelayInfoDoc ?: item.briefInfo.favIcon,
                 loadProfilePicture,
                 loadRobohash,
+                item.relayStat.pingInMs,
                 MaterialTheme.colorScheme.largeRelayIconModifier,
             )
 

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListView.kt
@@ -322,6 +322,7 @@ fun ClickableRelayItem(
                 iconUrlFromRelayInfoDoc ?: item.briefInfo.favIcon,
                 loadProfilePicture,
                 loadRobohash,
+                item.relayStat.pingInMs,
                 MaterialTheme.colorScheme.largeRelayIconModifier,
             )
 

diff --git a/.../main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelaySetupInfoProposalRow.kt b/.../main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelaySetupInfoProposalRow.kt
@@ -93,6 +93,7 @@ fun Kind3RelaySetupInfoProposalRow(
                 iconUrlFromRelayInfoDoc ?: item.briefInfo.favIcon,
                 loadProfilePicture,
                 loadRobohash,
+                item.relayStat.pingInMs,
                 MaterialTheme.colorScheme.largeRelayIconModifier,
             )
 

diff --git a/...hyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayInformationDialog.kt b/...hyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayInformationDialog.kt
@@ -135,6 +135,7 @@ fun RelayInformationDialog(
                                 iconUrl = relayInfo.icon ?: relayBriefInfo.favIcon,
                                 loadProfilePicture = accountViewModel.settings.showProfilePictures.value,
                                 loadRobohash = accountViewModel.settings.featureSet != FeatureSetType.PERFORMANCE,
+                                RelayStats.get(url = relayBriefInfo.url).pingInMs,
                                 iconModifier = MaterialTheme.colorScheme.largeRelayIconModifier,
                             )
                         }

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt
@@ -62,8 +62,6 @@ import com.vitorpamplona.amethyst.ui.theme.StdStartPadding
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.relayIconModifier
 import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
-import com.vitorpamplona.ammolite.relays.RelayStats
-import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
 
 @Composable
 public fun RelayBadgesHorizontal(
@@ -189,6 +187,7 @@ fun RenderRelay(
             displayUrl = relay.displayUrl,
             iconUrl = relayInfo?.icon ?: relay.favIcon,
             loadProfilePicture = accountViewModel.settings.showProfilePictures.value,
+            pingInMs = 0,
             loadRobohash = accountViewModel.settings.featureSet != FeatureSetType.PERFORMANCE,
         )
     }
@@ -200,6 +199,7 @@ fun RenderRelayIcon(
     iconUrl: String?,
     loadProfilePicture: Boolean,
     loadRobohash: Boolean,
+    pingInMs: Long,
     iconModifier: Modifier = MaterialTheme.colorScheme.relayIconModifier,
 ) {
     Box(
@@ -214,31 +214,31 @@ fun RenderRelayIcon(
             loadProfilePicture = loadProfilePicture,
             loadRobohash = loadRobohash,
         )
-
-        Box(
-            modifier =
-                Modifier
-                    .clip(RoundedCornerShape(8.dp))
-                    .background(
-                        Color.Gray,
-                    ),
-        ) {
-            val pingInMs = RelayStats.get(RelayUrlFormatter.normalize(displayUrl)).pingInMs
-            Text(
-                modifier = Modifier.padding(4.dp),
-                style =
-                    TextStyle(
-                        color =
-                            if (pingInMs <= 150) {
-                                Color.Green
-                            } else if (pingInMs <= 300) {
-                                Color.Yellow
-                            } else {
-                                Color.Red
-                            },
-                    ),
-                text = "$pingInMs",
-            )
+        if (pingInMs > 0) {
+            Box(
+                modifier =
+                    Modifier
+                        .clip(RoundedCornerShape(8.dp))
+                        .background(
+                            Color.Gray,
+                        ),
+            ) {
+                Text(
+                    modifier = Modifier.padding(4.dp),
+                    style =
+                        TextStyle(
+                            color =
+                                if (pingInMs <= 150) {
+                                    Color.Green
+                                } else if (pingInMs <= 300) {
+                                    Color.Yellow
+                                } else {
+                                    Color.Red
+                                },
+                        ),
+                    text = "$pingInMs",
+                )
+            }
         }
     }
 }