Removes the rest of the theming
This commit is contained in:
+3
-9
@@ -20,6 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
package com.vitorpamplona.amethyst.ui.screen.loggedIn.nests.room
|
package com.vitorpamplona.amethyst.ui.screen.loggedIn.nests.room
|
||||||
|
|
||||||
|
import android.R.attr.textColor
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
@@ -47,7 +48,6 @@ import androidx.compose.ui.unit.dp
|
|||||||
import coil3.compose.AsyncImage
|
import coil3.compose.AsyncImage
|
||||||
import com.vitorpamplona.amethyst.R
|
import com.vitorpamplona.amethyst.R
|
||||||
import com.vitorpamplona.amethyst.commons.model.nip53LiveActivities.LiveActivitiesChannel
|
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.model.LocalCache
|
||||||
import com.vitorpamplona.amethyst.ui.navigation.navs.INav
|
import com.vitorpamplona.amethyst.ui.navigation.navs.INav
|
||||||
import com.vitorpamplona.amethyst.ui.navigation.routes.routeFor
|
import com.vitorpamplona.amethyst.ui.navigation.routes.routeFor
|
||||||
@@ -105,13 +105,8 @@ private fun NestJoinCardContent(
|
|||||||
// are missing — those rooms aren't joinable on the audio plane.
|
// are missing — those rooms aren't joinable on the audio plane.
|
||||||
if (serviceBase.isNullOrBlank() || endpoint.isNullOrBlank() || roomId.isBlank()) return
|
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 mutedTextColor = textColor.copy(alpha = 0.7f)
|
||||||
|
|
||||||
val image = remember(event) { event.image() }
|
val image = remember(event) { event.image() }
|
||||||
@@ -264,7 +259,6 @@ private fun NestJoinCardContent(
|
|||||||
JoinNestButton(
|
JoinNestButton(
|
||||||
event = event,
|
event = event,
|
||||||
accountViewModel = accountViewModel,
|
accountViewModel = accountViewModel,
|
||||||
primaryColorOverride = theme.primaryArgb?.let { Color(it) },
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user