nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Starts relay observers with a non null value

Browse Source
This commit is contained in:
Vitor Pamplona
2023-12-22 09:15:21 -05:00
parent 2ce16325a1
commit 35cd9cb6c5
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListBox.kt
+1 -2
View File
@@ -24,14 +24,13 @@ import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonBoxModifer
import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonIconButtonModifier import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonIconButtonModifier
import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonIconModifier import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonIconModifier
import com.vitorpamplona.amethyst.ui.theme.placeholderText import com.vitorpamplona.amethyst.ui.theme.placeholderText
import kotlinx.collections.immutable.persistentListOf
@OptIn(ExperimentalLayoutApi::class) @OptIn(ExperimentalLayoutApi::class)
@Composable @Composable
fun RelayBadges(baseNote: Note, accountViewModel: AccountViewModel, nav: (String) -> Unit) { fun RelayBadges(baseNote: Note, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
var expanded by remember { mutableStateOf(false) } var expanded by remember { mutableStateOf(false) }
val relayList by baseNote.live().relayInfo.observeAsState(persistentListOf()) val relayList by baseNote.live().relayInfo.observeAsState(baseNote.relays)
Spacer(DoubleVertSpacer) Spacer(DoubleVertSpacer)
app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt
+1 -1
View File
@@ -57,7 +57,7 @@ public fun RelayBadgesHorizontal(baseNote: Note, accountViewModel: AccountViewMo
@OptIn(ExperimentalLayoutApi::class) @OptIn(ExperimentalLayoutApi::class)
@Composable @Composable
fun RenderRelayList(baseNote: Note, expanded: MutableState<Boolean>, accountViewModel: AccountViewModel, nav: (String) -> Unit) { fun RenderRelayList(baseNote: Note, expanded: MutableState<Boolean>, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
val noteRelays by baseNote.live().relayInfo.observeAsState() val noteRelays by baseNote.live().relayInfo.observeAsState(baseNote.relays)
FlowRow(StdStartPadding, verticalArrangement = Arrangement.Center) { FlowRow(StdStartPadding, verticalArrangement = Arrangement.Center) {
if (expanded.value) { if (expanded.value) {
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt
+2 -2
View File
@@ -402,9 +402,9 @@ private fun VideoUserOptionAction(
@OptIn(ExperimentalLayoutApi::class) @OptIn(ExperimentalLayoutApi::class)
@Composable @Composable
private fun RelayBadges(baseNote: Note, accountViewModel: AccountViewModel, nav: (String) -> Unit) { private fun RelayBadges(baseNote: Note, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
val noteRelays by baseNote.live().relayInfo.observeAsState() val noteRelays by baseNote.live().relayInfo.observeAsState(baseNote.relays)
FlowRow() { FlowRow {
noteRelays?.forEach { relayInfo -> noteRelays?.forEach { relayInfo ->
RenderRelay(relayInfo, accountViewModel, nav) RenderRelay(relayInfo, accountViewModel, nav)
} }