Merge remote-tracking branch 'origin/main' into claude/refactor-room-package-YQ22H

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -195,6 +195,8 @@ import com.vitorpamplona.quartz.nip47WalletConnect.rpc.Request
 import com.vitorpamplona.quartz.nip47WalletConnect.rpc.Response
 import com.vitorpamplona.quartz.nip51Lists.bookmarkList.BookmarkListEvent
 import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.AddressBookmark
+import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.MeetingSpaceEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEvent
 import com.vitorpamplona.quartz.nip56Reports.ReportType
 import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
 import com.vitorpamplona.quartz.nip57Zaps.LnZapPrivateEvent
@@ -1006,6 +1008,14 @@ class Account(
             relayList.addAll(event.relays())
         }
 
+        if (event is MeetingSpaceEvent) {
+            relayList.addAll(event.allRelayUrls())
+        }
+
+        if (event is LiveActivitiesEvent) {
+            relayList.addAll(event.allRelayUrls())
+        }
+
         relayList.addAll(computeRelaysForChannels(event))
 
         return relayList

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/create/CreateNestViewModel.kt

@@ -26,6 +26,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.nests.room.activity.NestAct
 import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.MeetingSpaceEvent
 import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.endpoint
 import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.image
+import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.relays
 import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.starts
 import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.summary
 import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.tags.StatusTag
@@ -159,6 +160,10 @@ class CreateNestViewModel : ViewModel() {
                     .trim()
                     .takeIf { it.isNotBlank() }
                     ?.let { image(it) }
+                relays(
+                    accountModel.outboxRelays.flow.value
+                        .toList(),
+                )
             }
 
         val signed =

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/room/lobby/NestJoinCard.kt

@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.nests.room.lobby
 
+import android.R.attr.textColor
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -47,7 +48,6 @@ import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.model.nip53LiveActivities.LiveActivitiesChannel
-import com.vitorpamplona.amethyst.commons.viewmodels.RoomTheme
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.routeFor
@@ -107,13 +107,8 @@ private fun NestJoinCardContent(
     // are missing — those rooms aren't joinable on the audio plane.
     if (serviceBase.isNullOrBlank() || endpoint.isNullOrBlank() || roomId.isBlank()) return
 
-    val theme = remember(event) { RoomTheme.from(event) }
+    val containerColor = MaterialTheme.colorScheme.surfaceVariant
-    val containerColor =
+    val textColor = MaterialTheme.colorScheme.onSurfaceVariant
-        theme.backgroundArgb?.let { Color(it) }
-            ?: MaterialTheme.colorScheme.surfaceVariant
-    val textColor =
-        theme.textArgb?.let { Color(it) }
-            ?: MaterialTheme.colorScheme.onSurfaceVariant
     val mutedTextColor = textColor.copy(alpha = 0.7f)
 
     val image = remember(event) { event.image() }
@@ -266,7 +261,6 @@ private fun NestJoinCardContent(
                     JoinNestButton(
                         event = event,
                         accountViewModel = accountViewModel,
-                        primaryColorOverride = theme.primaryArgb?.let { Color(it) },
                     )
                 }
             }