From c2c77aad2a8ba66b9202b3afab90689c0db68a84 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 22 Oct 2025 09:32:15 +0200 Subject: [PATCH] Improve API and fix theme glitch when switching between accounts. --- .../io/element/android/x/MainActivity.kt | 10 ++++++- .../android/appnav/LoggedInFlowNode.kt | 29 +++++++++++++++---- enterprise | 2 +- .../android/features/call/api/CallType.kt | 7 +++++ .../call/impl/ui/ElementCallActivity.kt | 10 ++++++- .../call/impl/ui/IncomingCallActivity.kt | 10 ++++++- .../enterprise/api/EnterpriseService.kt | 24 ++++++++++----- .../impl/DefaultEnterpriseService.kt | 23 +++++---------- .../enterprise/test/FakeEnterpriseService.kt | 23 ++++++--------- .../impl/unlock/activity/PinUnlockActivity.kt | 10 ++++++- .../reporter/DefaultBugReporterUrlProvider.kt | 25 +++++++++++----- libraries/designsystem/build.gradle.kts | 1 - .../designsystem/theme/ElementThemeApp.kt | 7 ++--- 13 files changed, 120 insertions(+), 61 deletions(-) diff --git a/app/src/main/kotlin/io/element/android/x/MainActivity.kt b/app/src/main/kotlin/io/element/android/x/MainActivity.kt index f80db878a7..b919351a80 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt @@ -16,6 +16,9 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalUriHandler import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen @@ -26,6 +29,7 @@ import com.bumble.appyx.core.integration.NodeHost import com.bumble.appyx.core.integrationpoint.NodeActivity import com.bumble.appyx.core.plugin.NodeReadyObserver import io.element.android.compound.theme.ElementTheme +import io.element.android.features.enterprise.api.SemanticColorsLightDark import io.element.android.features.lockscreen.api.LockScreenEntryPoint import io.element.android.features.lockscreen.api.LockScreenLockState import io.element.android.features.lockscreen.api.LockScreenService @@ -61,9 +65,13 @@ class MainActivity : NodeActivity() { @Composable private fun MainContent(appBindings: AppBindings) { val migrationState = appBindings.migrationEntryPoint().present() + val colors by remember { + appBindings.enterpriseService().semanticColorsFlow(sessionId = null) + }.collectAsState(SemanticColorsLightDark.default) ElementThemeApp( appPreferencesStore = appBindings.preferencesStore(), - enterpriseService = appBindings.enterpriseService(), + compoundLight = colors.light, + compoundDark = colors.dark, buildMeta = appBindings.buildMeta() ) { CompositionLocalProvider( diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt index b0fc707d07..0eea6f5236 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.lifecycle.lifecycleScope import com.bumble.appyx.core.composable.PermanentChild @@ -46,6 +47,8 @@ import io.element.android.appnav.loggedin.SendQueues import io.element.android.appnav.room.RoomFlowNode import io.element.android.appnav.room.RoomNavigationTarget import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode +import io.element.android.features.enterprise.api.EnterpriseService +import io.element.android.features.enterprise.api.SemanticColorsLightDark import io.element.android.features.enterprise.api.SessionEnterpriseService import io.element.android.features.ftue.api.FtueEntryPoint import io.element.android.features.ftue.api.state.FtueService @@ -66,6 +69,8 @@ import io.element.android.libraries.architecture.BackstackView import io.element.android.libraries.architecture.BaseFlowNode import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.waitForNavTargetAttached +import io.element.android.libraries.core.meta.BuildMeta +import io.element.android.libraries.designsystem.theme.ElementThemeApp import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher import io.element.android.libraries.di.SessionScope import io.element.android.libraries.di.annotations.SessionCoroutineScope @@ -79,6 +84,7 @@ import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias import io.element.android.libraries.matrix.api.permalink.PermalinkData import io.element.android.libraries.matrix.api.verification.SessionVerificationServiceListener import io.element.android.libraries.matrix.api.verification.VerificationRequest +import io.element.android.libraries.preferences.api.store.AppPreferencesStore import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService import io.element.android.libraries.ui.common.nodes.emptyNode import io.element.android.services.appnavstate.api.AppNavigationStateService @@ -122,6 +128,9 @@ class LoggedInFlowNode( private val sessionEnterpriseService: SessionEnterpriseService, private val networkMonitor: NetworkMonitor, private val notificationConversationService: NotificationConversationService, + private val enterpriseService: EnterpriseService, + private val appPreferencesStore: AppPreferencesStore, + private val buildMeta: BuildMeta, snackbarDispatcher: SnackbarDispatcher, ) : BaseFlowNode( backstack = BackStack( @@ -538,11 +547,21 @@ class LoggedInFlowNode( @Composable override fun View(modifier: Modifier) { - Box(modifier = modifier) { - val ftueState by ftueService.state.collectAsState() - BackstackView() - if (ftueState is FtueState.Complete) { - PermanentChild(permanentNavModel = permanentNavModel, navTarget = NavTarget.LoggedInPermanent) + val colors by remember { + enterpriseService.semanticColorsFlow(sessionId = matrixClient.sessionId) + }.collectAsState(SemanticColorsLightDark.default) + ElementThemeApp( + appPreferencesStore = appPreferencesStore, + compoundLight = colors.light, + compoundDark = colors.dark, + buildMeta = buildMeta, + ) { + Box(modifier = modifier) { + val ftueState by ftueService.state.collectAsState() + BackstackView() + if (ftueState is FtueState.Complete) { + PermanentChild(permanentNavModel = permanentNavModel, navTarget = NavTarget.LoggedInPermanent) + } } } } diff --git a/enterprise b/enterprise index f662f079f9..b5ab0a6aa0 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit f662f079f911b728e5769d10268e2c2775d7287a +Subproject commit b5ab0a6aa01aa03e89fa7593ea144a043b8f7487 diff --git a/features/call/api/src/main/kotlin/io/element/android/features/call/api/CallType.kt b/features/call/api/src/main/kotlin/io/element/android/features/call/api/CallType.kt index 2c279b7725..677b76a825 100644 --- a/features/call/api/src/main/kotlin/io/element/android/features/call/api/CallType.kt +++ b/features/call/api/src/main/kotlin/io/element/android/features/call/api/CallType.kt @@ -31,3 +31,10 @@ sealed interface CallType : NodeInputs, Parcelable { } } } + +fun CallType.getSessionId(): SessionId? { + return when (this) { + is CallType.ExternalUrl -> null + is CallType.RoomCall -> sessionId + } +} diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt index ae04606d29..75fff51892 100644 --- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt +++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt @@ -23,8 +23,10 @@ import androidx.appcompat.app.AppCompatActivity import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember import androidx.compose.runtime.rememberUpdatedState import androidx.core.app.PictureInPictureModeChangedInfo import androidx.core.content.IntentCompat @@ -33,6 +35,7 @@ import androidx.lifecycle.Lifecycle import dev.zacsweers.metro.Inject import io.element.android.features.call.api.CallType import io.element.android.features.call.api.CallType.ExternalUrl +import io.element.android.features.call.api.getSessionId import io.element.android.features.call.impl.DefaultElementCallEntryPoint import io.element.android.features.call.impl.di.CallBindings import io.element.android.features.call.impl.pip.PictureInPictureEvents @@ -42,6 +45,7 @@ import io.element.android.features.call.impl.pip.PipView import io.element.android.features.call.impl.services.CallForegroundService import io.element.android.features.call.impl.utils.CallIntentDataParser import io.element.android.features.enterprise.api.EnterpriseService +import io.element.android.features.enterprise.api.SemanticColorsLightDark import io.element.android.libraries.androidutils.browser.ConsoleMessageLogger import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.bindings @@ -105,9 +109,13 @@ class ElementCallActivity : setContent { val pipState = pictureInPicturePresenter.present() ListenToAndroidEvents(pipState) + val colors by remember(webViewTarget.value?.getSessionId()) { + enterpriseService.semanticColorsFlow(sessionId = webViewTarget.value?.getSessionId()) + }.collectAsState(SemanticColorsLightDark.default) ElementThemeApp( appPreferencesStore = appPreferencesStore, - enterpriseService = enterpriseService, + compoundLight = colors.light, + compoundDark = colors.dark, buildMeta = buildMeta, ) { val state = presenter.present() diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallActivity.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallActivity.kt index daf0e26797..10273e4fd6 100644 --- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallActivity.kt +++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallActivity.kt @@ -11,6 +11,9 @@ import android.os.Bundle import android.view.WindowManager import androidx.activity.compose.setContent import androidx.appcompat.app.AppCompatActivity +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.core.content.IntentCompat import androidx.lifecycle.lifecycleScope import dev.zacsweers.metro.Inject @@ -21,6 +24,7 @@ import io.element.android.features.call.impl.notifications.CallNotificationData import io.element.android.features.call.impl.utils.ActiveCallManager import io.element.android.features.call.impl.utils.CallState import io.element.android.features.enterprise.api.EnterpriseService +import io.element.android.features.enterprise.api.SemanticColorsLightDark import io.element.android.libraries.architecture.bindings import io.element.android.libraries.core.meta.BuildMeta import io.element.android.libraries.designsystem.theme.ElementThemeApp @@ -78,9 +82,13 @@ class IncomingCallActivity : AppCompatActivity() { val notificationData = intent?.let { IntentCompat.getParcelableExtra(it, EXTRA_NOTIFICATION_DATA, CallNotificationData::class.java) } if (notificationData != null) { setContent { + val colors by remember { + enterpriseService.semanticColorsFlow(sessionId = notificationData.sessionId) + }.collectAsState(SemanticColorsLightDark.default) ElementThemeApp( appPreferencesStore = appPreferencesStore, - enterpriseService = enterpriseService, + compoundLight = colors.light, + compoundDark = colors.dark, buildMeta = buildMeta, ) { IncomingCallScreen( diff --git a/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt b/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt index 2f62327643..d7140867c9 100644 --- a/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt +++ b/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt @@ -7,9 +7,9 @@ package io.element.android.features.enterprise.api -import androidx.compose.runtime.Composable -import androidx.compose.runtime.State import io.element.android.compound.tokens.generated.SemanticColors +import io.element.android.compound.tokens.generated.compoundColorsDark +import io.element.android.compound.tokens.generated.compoundColorsLight import io.element.android.libraries.matrix.api.core.SessionId import kotlinx.coroutines.flow.Flow @@ -26,16 +26,12 @@ interface EnterpriseService { */ suspend fun overrideBrandColor(sessionId: SessionId?, brandColor: String?) - @Composable - fun semanticColorsLight(): State - - @Composable - fun semanticColorsDark(): State + fun semanticColorsFlow(sessionId: SessionId?): Flow fun firebasePushGateway(): String? fun unifiedPushDefaultPushGateway(): String? - val bugReportUrlFlow: Flow + fun bugReportUrlFlow(sessionId: SessionId?): Flow companion object { const val ANY_ACCOUNT_PROVIDER = "*" @@ -47,3 +43,15 @@ fun EnterpriseService.canConnectToAnyHomeserver(): Boolean { it.isEmpty() || it.contains(EnterpriseService.ANY_ACCOUNT_PROVIDER) } } + +data class SemanticColorsLightDark( + val light: SemanticColors, + val dark: SemanticColors, +) { + companion object { + val default = SemanticColorsLightDark( + light = compoundColorsLight, + dark = compoundColorsDark, + ) + } +} diff --git a/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt index f2171c4a49..cfff305585 100644 --- a/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt +++ b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt @@ -7,19 +7,14 @@ package io.element.android.features.enterprise.impl -import androidx.compose.runtime.Composable -import androidx.compose.runtime.State -import androidx.compose.runtime.derivedStateOf -import androidx.compose.runtime.remember import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesBinding import dev.zacsweers.metro.Inject -import io.element.android.compound.tokens.generated.SemanticColors -import io.element.android.compound.tokens.generated.compoundColorsDark -import io.element.android.compound.tokens.generated.compoundColorsLight import io.element.android.features.enterprise.api.BugReportUrl import io.element.android.features.enterprise.api.EnterpriseService +import io.element.android.features.enterprise.api.SemanticColorsLightDark import io.element.android.libraries.matrix.api.core.SessionId +import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf @ContributesBinding(AppScope::class) @@ -34,18 +29,14 @@ class DefaultEnterpriseService : EnterpriseService { override suspend fun overrideBrandColor(sessionId: SessionId?, brandColor: String?) = Unit - @Composable - override fun semanticColorsLight(): State { - return remember { derivedStateOf { compoundColorsLight } } - } - - @Composable - override fun semanticColorsDark(): State { - return remember { derivedStateOf { compoundColorsDark } } + override fun semanticColorsFlow(sessionId: SessionId?): Flow { + return flowOf(SemanticColorsLightDark.default) } override fun firebasePushGateway(): String? = null override fun unifiedPushDefaultPushGateway(): String? = null - override val bugReportUrlFlow = flowOf(BugReportUrl.UseDefault) + override fun bugReportUrlFlow(sessionId: SessionId?): Flow { + return flowOf(BugReportUrl.UseDefault) + } } diff --git a/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt b/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt index 64f2898078..10ef91cf41 100644 --- a/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt +++ b/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt @@ -7,11 +7,9 @@ package io.element.android.features.enterprise.test -import androidx.compose.runtime.Composable -import androidx.compose.runtime.State -import io.element.android.compound.tokens.generated.SemanticColors import io.element.android.features.enterprise.api.BugReportUrl import io.element.android.features.enterprise.api.EnterpriseService +import io.element.android.features.enterprise.api.SemanticColorsLightDark import io.element.android.libraries.matrix.api.core.SessionId import io.element.android.tests.testutils.lambda.lambdaError import io.element.android.tests.testutils.simulateLongTask @@ -24,12 +22,13 @@ class FakeEnterpriseService( private val isEnterpriseUserResult: (SessionId) -> Boolean = { lambdaError() }, private val defaultHomeserverListResult: () -> List = { emptyList() }, private val isAllowedToConnectToHomeserverResult: (String) -> Boolean = { lambdaError() }, - private val semanticColorsLightResult: () -> State = { lambdaError() }, - private val semanticColorsDarkResult: () -> State = { lambdaError() }, + initialSemanticColors: SemanticColorsLightDark = SemanticColorsLightDark.default, private val overrideBrandColorResult: (SessionId?, String?) -> Unit = { _, _ -> lambdaError() }, private val firebasePushGatewayResult: () -> String? = { lambdaError() }, private val unifiedPushDefaultPushGatewayResult: () -> String? = { lambdaError() }, ) : EnterpriseService { + private val semanticColorsState = MutableStateFlow(initialSemanticColors) + override suspend fun isEnterpriseUser(sessionId: SessionId): Boolean = simulateLongTask { isEnterpriseUserResult(sessionId) } @@ -46,14 +45,8 @@ class FakeEnterpriseService( overrideBrandColorResult(sessionId, brandColor) } - @Composable - override fun semanticColorsLight(): State { - return semanticColorsLightResult() - } - - @Composable - override fun semanticColorsDark(): State { - return semanticColorsDarkResult() + override fun semanticColorsFlow(sessionId: SessionId?): Flow { + return semanticColorsState.asStateFlow() } override fun firebasePushGateway(): String? { @@ -65,5 +58,7 @@ class FakeEnterpriseService( } val bugReportUrlMutableFlow = MutableStateFlow(BugReportUrl.UseDefault) - override val bugReportUrlFlow: Flow = bugReportUrlMutableFlow.asStateFlow() + override fun bugReportUrlFlow(sessionId: SessionId?): Flow { + return bugReportUrlMutableFlow.asStateFlow() + } } diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/activity/PinUnlockActivity.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/activity/PinUnlockActivity.kt index a494bca8c6..11025b036e 100644 --- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/activity/PinUnlockActivity.kt +++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/activity/PinUnlockActivity.kt @@ -14,9 +14,13 @@ import androidx.activity.OnBackPressedCallback import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.lifecycle.lifecycleScope import dev.zacsweers.metro.Inject import io.element.android.features.enterprise.api.EnterpriseService +import io.element.android.features.enterprise.api.SemanticColorsLightDark import io.element.android.features.lockscreen.api.LockScreenLockState import io.element.android.features.lockscreen.api.LockScreenService import io.element.android.features.lockscreen.impl.unlock.PinUnlockPresenter @@ -46,9 +50,13 @@ class PinUnlockActivity : AppCompatActivity() { super.onCreate(savedInstanceState) bindings().inject(this) setContent { + val colors by remember { + enterpriseService.semanticColorsFlow(sessionId = null) + }.collectAsState(SemanticColorsLightDark.default) ElementThemeApp( appPreferencesStore = appPreferencesStore, - enterpriseService = enterpriseService, + compoundLight = colors.light, + compoundDark = colors.dark, buildMeta = buildMeta, ) { val state = presenter.present() diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterUrlProvider.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterUrlProvider.kt index 84f8e2ca0a..7148d9e95e 100644 --- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterUrlProvider.kt +++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterUrlProvider.kt @@ -13,7 +13,12 @@ import dev.zacsweers.metro.Inject import io.element.android.appconfig.RageshakeConfig import io.element.android.features.enterprise.api.BugReportUrl import io.element.android.features.enterprise.api.EnterpriseService +import io.element.android.libraries.matrix.api.core.SessionId +import io.element.android.libraries.sessionstorage.api.SessionStore +import io.element.android.libraries.sessionstorage.api.sessionIdFlow +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map import okhttp3.HttpUrl @@ -24,17 +29,21 @@ import okhttp3.HttpUrl.Companion.toHttpUrl class DefaultBugReporterUrlProvider( private val bugReportAppNameProvider: BugReportAppNameProvider, private val enterpriseService: EnterpriseService, + private val sessionStore: SessionStore, ) : BugReporterUrlProvider { + @OptIn(ExperimentalCoroutinesApi::class) override fun provide(): Flow { if (bugReportAppNameProvider.provide().isEmpty()) return flowOf(null) - return enterpriseService.bugReportUrlFlow - .map { bugReportUrl -> - when (bugReportUrl) { - is BugReportUrl.Custom -> bugReportUrl.url - BugReportUrl.Disabled -> null - BugReportUrl.UseDefault -> RageshakeConfig.BUG_REPORT_URL.takeIf { it.isNotEmpty() } + return sessionStore.sessionIdFlow().flatMapLatest { sessionId -> + enterpriseService.bugReportUrlFlow(sessionId?.let(::SessionId)) + .map { bugReportUrl -> + when (bugReportUrl) { + is BugReportUrl.Custom -> bugReportUrl.url + BugReportUrl.Disabled -> null + BugReportUrl.UseDefault -> RageshakeConfig.BUG_REPORT_URL.takeIf { it.isNotEmpty() } + } } - } - .map { it?.toHttpUrl() } + .map { it?.toHttpUrl() } + } } } diff --git a/libraries/designsystem/build.gradle.kts b/libraries/designsystem/build.gradle.kts index 3983317055..ff0b4878b2 100644 --- a/libraries/designsystem/build.gradle.kts +++ b/libraries/designsystem/build.gradle.kts @@ -33,7 +33,6 @@ android { implementation(libs.androidx.compose.material3.adaptive) implementation(libs.coil.compose) implementation(libs.vanniktech.blurhash) - implementation(projects.features.enterprise.api) implementation(projects.libraries.androidutils) implementation(projects.libraries.architecture) implementation(projects.libraries.core) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementThemeApp.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementThemeApp.kt index 78d02c7f17..adec2348ef 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementThemeApp.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementThemeApp.kt @@ -19,7 +19,7 @@ import io.element.android.compound.theme.ElementTheme import io.element.android.compound.theme.Theme import io.element.android.compound.theme.isDark import io.element.android.compound.theme.mapToTheme -import io.element.android.features.enterprise.api.EnterpriseService +import io.element.android.compound.tokens.generated.SemanticColors import io.element.android.libraries.core.meta.BuildMeta import io.element.android.libraries.core.meta.BuildType import io.element.android.libraries.preferences.api.store.AppPreferencesStore @@ -53,7 +53,8 @@ val LocalBuildMeta = staticCompositionLocalOf { @Composable fun ElementThemeApp( appPreferencesStore: AppPreferencesStore, - enterpriseService: EnterpriseService, + compoundLight: SemanticColors, + compoundDark: SemanticColors, buildMeta: BuildMeta, content: @Composable () -> Unit, ) { @@ -70,8 +71,6 @@ fun ElementThemeApp( } ) } - val compoundLight by enterpriseService.semanticColorsLight() - val compoundDark by enterpriseService.semanticColorsDark() CompositionLocalProvider( LocalBuildMeta provides buildMeta, ) {