Skip to content

Open source Grok Bot alternative, Bring your own agent and subscription: message Claude Code, Codex, Gemini CLI, Cursor, Copilot and 40+ AI agents as bots on your own computer, from iPhone, Mac, Windows, Linux or terminal. Agent-agnostic and free. Also a Muse and Dots alternative. Built in Rust.

fix(apps): show the selected connection on its row

forwardxua8ab12494635
diff --git a/apps/android/app/src/androidTest/kotlin/com/codync/android/AccountScreenTest.kt b/apps/android/app/src/androidTest/kotlin/com/codync/android/AccountScreenTest.kt
index a72eeab2..1c91a933 100644
--- a/apps/android/app/src/androidTest/kotlin/com/codync/android/AccountScreenTest.kt
+++ b/apps/android/app/src/androidTest/kotlin/com/codync/android/AccountScreenTest.kt
@@ -129,9 +129,10 @@ class AccountScreenTest {
compose.onNodeWithText("Remove").performClick()
compose.onNodeWithText("Remove ${computer.name}?").assertIsDisplayed()
compose.onNodeWithText("Cancel").performClick()
+ compose.onNodeWithText("Auto: Wi-Fi or Tailscale, then Cloudflare").assertIsDisplayed()
compose.onNodeWithContentDescription("Connection").performClick()
compose.onNodeWithText("Wi-Fi or Tailscale only, never Cloudflare").assertIsDisplayed()
- compose.onNodeWithText("Auto: Wi-Fi or Tailscale, then Cloudflare").assertIsSelected()
+ compose.onNode(hasText("Auto: Wi-Fi or Tailscale, then Cloudflare") and isSelected()).assertIsDisplayed()
compose.setContent { Hosted { SettingsView(state, viewModel(), null, {}, {}, {}, embedded = true) } }
compose.onNodeWithText("Settings").assertIsDisplayed()
compose.onNodeWithText("Pair a computer").assertDoesNotExist()
diff --git a/apps/android/app/src/main/kotlin/com/codync/android/SettingsView.kt b/apps/android/app/src/main/kotlin/com/codync/android/SettingsView.kt
index cc3cc7a8..44115081 100644
--- a/apps/android/app/src/main/kotlin/com/codync/android/SettingsView.kt
+++ b/apps/android/app/src/main/kotlin/com/codync/android/SettingsView.kt
@@ -38,6 +38,7 @@ import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.heading
import androidx.compose.ui.semantics.paneTitle
@@ -242,7 +243,9 @@ private class ComputerActions(val extensions: () -> Unit, val screen: () -> Unit
Modifier.fillMaxWidth().padding(top = 14.dp), label = "Connection") {
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) {
Box(Modifier.width(26.dp), contentAlignment = Alignment.Center) { Symbol(computer.route.icon, size = 20.dp, tint = Palette.text) }
- Text(tr("Connection"), Modifier.weight(1f), style = Type.body, color = Palette.text)
+ Text(tr("Connection"), style = Type.body, color = Palette.text)
+ Text(tr(routeTitle(computer.route, computer.cloud)), Modifier.weight(1f), style = Type.subheadline,
+ color = Palette.secondary, textAlign = TextAlign.End)
Symbol("chevron.down", size = 13.dp, tint = Palette.tertiary)
}
}
diff --git a/apps/android/design/src/main/kotlin/com/codync/android/design/Menus.kt b/apps/android/design/src/main/kotlin/com/codync/android/design/Menus.kt
index 82eb6464..56768443 100644
--- a/apps/android/design/src/main/kotlin/com/codync/android/design/Menus.kt
+++ b/apps/android/design/src/main/kotlin/com/codync/android/design/Menus.kt
@@ -63,7 +63,6 @@ import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.selected
-import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp
import com.kyant.shapes.RoundedRectangle
@@ -251,8 +250,7 @@ private val MenuShape = RoundedRectangle(26.dp)
Box(Modifier.size(24.dp), contentAlignment = Alignment.Center) {
if (leading != null) Symbol(leading, size = 21.dp, tint = ink)
}
- Text(tr(item.title), Modifier.weight(1f), style = if (bold) Type.body.semibold else Type.body, color = ink,
- maxLines = 2, overflow = TextOverflow.Ellipsis)
+ Text(tr(item.title), Modifier.weight(1f), style = if (bold) Type.body.semibold else Type.body, color = ink)
if (item.children != null) Symbol("chevron.right", size = 16.dp, tint = Palette.secondary)
}
}
diff --git a/apps/ios/Kit/Sources/CodyncUI/Controls.swift b/apps/ios/Kit/Sources/CodyncUI/Controls.swift
index 3fdd1e7b..c6e596a2 100644
--- a/apps/ios/Kit/Sources/CodyncUI/Controls.swift
+++ b/apps/ios/Kit/Sources/CodyncUI/Controls.swift
@@ -206,15 +206,27 @@ private struct ContextActions: ViewModifier {
}
@ViewBuilder private func menuLabel(_ item: MenuItem) -> some View {
+ let title = menuTitle(item.title)
if let image = item.image {
- SwiftUI.Label { Text(L10n.tr(item.title)) } icon: { image }
+ SwiftUI.Label { title } icon: { image }
} else if let icon = item.icon {
- SwiftUI.Label(L10n.tr(item.title), systemImage: icon)
+ SwiftUI.Label { title } icon: { Image(systemName: icon) }
} else {
- Text(L10n.tr(item.title))
+ title
}
}
+/// A menu title wraps instead of ending in an ellipsis. A long choice, such as a connection route,
+/// asks for enough width to show the host at the end.
+private func menuTitle(_ title: String) -> some View {
+ let text = L10n.tr(title)
+ return Text(text)
+ .lineLimit(6)
+ .multilineTextAlignment(.leading)
+ .fixedSize(horizontal: false, vertical: true)
+ .frame(minWidth: text.count > 36 ? 280 : 0, alignment: .leading)
+}
+
/// A button that opens the system menu.
public struct DropdownMenu<Label: View>: View {
let items: () -> [MenuItem]
diff --git a/apps/ios/Views/ComputerRows.swift b/apps/ios/Views/ComputerRows.swift
index 847fd426..d982152b 100644
--- a/apps/ios/Views/ComputerRows.swift
+++ b/apps/ios/Views/ComputerRows.swift
@@ -121,10 +121,14 @@ struct ComputerRow: View {
}
}
} label: {
- HStack(spacing: 12) {
+ HStack(alignment: .center, spacing: 12) {
Image(systemName: preference.icon).font(.system(size: 17)).frame(width: 26)
Text(L10n.tr("Connection"))
- Spacer(minLength: 8)
+ Text(L10n.tr(RelayCopy.routeTitle(preference, cloud: store.computer.cloud)))
+ .font(.subheadline)
+ .foregroundStyle(Palette.secondary)
+ .multilineTextAlignment(.trailing)
+ .frame(maxWidth: .infinity, alignment: .trailing)
Image(systemName: "chevron.up.chevron.down").font(.caption.weight(.semibold)).foregroundStyle(Palette.tertiary)
}
.foregroundStyle(Palette.text)