refactor(android): distill provider availability cleanup

This commit is contained in:
Ayaan Zaidi
2026-06-05 15:48:42 +05:30
parent 8b66003a0b
commit 30160933f0
4 changed files with 14 additions and 30 deletions

View File

@@ -283,7 +283,7 @@ private fun providerSetupSubtitle(
row: ProviderRow?,
): String =
when {
row?.status == "Expiring" -> "Credential expires soon"
row?.warning == true -> "Credential expires soon"
row?.ready == true -> if (row.modelCount > 0) "${row.modelCount} models available" else "Ready"
row?.available == true -> if (row.modelCount > 0) "${row.modelCount} models available" else "Available"
row?.setupRequired == true -> "Finish setup to use ${row.name}"
@@ -295,7 +295,7 @@ private fun providerSetupSubtitle(
private fun providerSetupStatusLabel(row: ProviderRow?): String =
when {
row?.ready == true -> "Ready"
row?.status == "Expiring" -> "Expiring"
row?.warning == true -> "Expiring"
row?.available == true -> "Available"
row?.setupRequired == false -> "Catalog"
else -> "Setup"
@@ -313,7 +313,6 @@ internal fun modelProviderReady(status: String): Boolean {
private fun modelProviderExpiring(status: String): Boolean = status.trim().lowercase() == "expiring"
/** Counts providers with either ready auth status or currently available configured models. */
internal fun readyModelProviderCount(
providers: List<GatewayModelProviderSummary>,
models: List<GatewayModelSummary>,
@@ -327,7 +326,6 @@ internal fun readyModelProviderCount(
// readiness path while still honoring explicit false from upgraded gateways.
private fun modelAvailabilityUsable(model: GatewayModelSummary): Boolean = model.available != false
/** Counts auth-backed providers that can serve now but need renewal soon. */
internal fun expiringModelProviderCount(providers: List<GatewayModelProviderSummary>): Int =
providers
.filter { modelProviderExpiring(it.status) }

View File

@@ -103,10 +103,7 @@ private val shellNavTabs = listOf(Tab.Overview, Tab.Chat, Tab.Voice, Tab.Setting
private val shellContentInsets: WindowInsets
@Composable get() = WindowInsets.safeDrawing.only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal)
internal fun shellBottomNavVisible(
keyboardVisible: Boolean,
commandOpen: Boolean,
): Boolean = !keyboardVisible && !commandOpen
internal fun shellBottomNavVisible(keyboardVisible: Boolean, commandOpen: Boolean): Boolean = !keyboardVisible && !commandOpen
/** Main post-onboarding shell that owns top-level Android navigation state. */
@Composable