diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt index 290f880b4..ab4ebda52 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt @@ -53,7 +53,8 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) val accountUser = accountUserState?.user val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() } - val relayPoolLiveData by relayViewModel.relayPoolLiveData.observeAsState() + val connectedRelaysLiveData by relayViewModel.connectedRelaysLiveData.observeAsState() + val availableRelaysLiveData by relayViewModel.availableRelaysLiveData.observeAsState() val coroutineScope = rememberCoroutineScope() @@ -105,8 +106,8 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) }, actions = { Text( - relayPoolLiveData ?: "--/--", - color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f) + "${connectedRelaysLiveData ?: "--"}/${availableRelaysLiveData ?: "--"}", + color = if (connectedRelaysLiveData == 0) Color.Red else MaterialTheme.colors.onSurface.copy(alpha = 0.32f) ) IconButton( diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/RelayPoolViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/RelayPoolViewModel.kt index 26c861352..799b259f7 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/RelayPoolViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/RelayPoolViewModel.kt @@ -6,7 +6,10 @@ import androidx.lifecycle.ViewModel import com.vitorpamplona.amethyst.service.relays.RelayPool class RelayPoolViewModel: ViewModel() { - val relayPoolLiveData: LiveData = Transformations.map(RelayPool.live) { - it.relays.report() + val connectedRelaysLiveData: LiveData = Transformations.map(RelayPool.live) { + it.relays.connectedRelays() + } + val availableRelaysLiveData: LiveData = Transformations.map(RelayPool.live) { + it.relays.availableRelays() } } \ No newline at end of file