From eaaa9a6446799237878e767386925f29f2b13077 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 5 Jan 2024 09:54:27 -0500 Subject: [PATCH] Adjust position of the participant list in live streams. --- .../amethyst/ui/note/NoteCompose.kt | 46 +++++++++---------- quartz/build.gradle | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt index d0d6bcd0a..698157d76 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt @@ -3459,29 +3459,6 @@ fun RenderLiveActivityEventInner(baseNote: Note, accountViewModel: AccountViewMo } } - participantUsers.forEach { - Row( - verticalAlignment = CenterVertically, - modifier = Modifier - .padding(top = 5.dp, start = 10.dp, end = 10.dp) - .clickable { - nav("User/${it.second.pubkeyHex}") - } - ) { - ClickableUserPicture(it.second, 25.dp, accountViewModel) - Spacer(StdHorzSpacer) - UsernameDisplay(it.second, Modifier.weight(1f)) - Spacer(StdHorzSpacer) - it.first.role?.let { - Text( - text = it.capitalize(Locale.ROOT), - color = MaterialTheme.colorScheme.placeholderText, - maxLines = 1 - ) - } - } - } - media?.let { media -> if (status == STATUS_LIVE) { CheckIfUrlIsOnline(media, accountViewModel) { isOnline -> @@ -3529,6 +3506,29 @@ fun RenderLiveActivityEventInner(baseNote: Note, accountViewModel: AccountViewMo } } } + + participantUsers.forEach { + Row( + verticalAlignment = CenterVertically, + modifier = Modifier + .padding(vertical = 5.dp) + .clickable { + nav("User/${it.second.pubkeyHex}") + } + ) { + ClickableUserPicture(it.second, 25.dp, accountViewModel) + Spacer(StdHorzSpacer) + UsernameDisplay(it.second, Modifier.weight(1f)) + Spacer(StdHorzSpacer) + it.first.role?.let { + Text( + text = it.capitalize(Locale.ROOT), + color = MaterialTheme.colorScheme.placeholderText, + maxLines = 1 + ) + } + } + } } @Composable diff --git a/quartz/build.gradle b/quartz/build.gradle index 985c833d5..baaa236ec 100644 --- a/quartz/build.gradle +++ b/quartz/build.gradle @@ -40,7 +40,7 @@ dependencies { // Bitcoin secp256k1 bindings to Android api 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.12.0' - // LibSodium for XChaCha encryption + // LibSodium for ChaCha encryption implementation "com.goterl:lazysodium-android:5.1.0@aar" implementation 'net.java.dev.jna:jna:5.14.0@aar'