Default to dark theme for EC (#7162)
* Default to dark theme for EC (this is the intended design on light and dark system configuration) * Use `theme=dark` url param for element call * Update CallScreenPresenter.kt
This commit is contained in:
+1
-2
@@ -22,7 +22,6 @@ import dev.zacsweers.metro.Assisted
|
|||||||
import dev.zacsweers.metro.AssistedFactory
|
import dev.zacsweers.metro.AssistedFactory
|
||||||
import dev.zacsweers.metro.AssistedInject
|
import dev.zacsweers.metro.AssistedInject
|
||||||
import im.vector.app.features.analytics.plan.MobileScreen
|
import im.vector.app.features.analytics.plan.MobileScreen
|
||||||
import io.element.android.compound.theme.ElementTheme
|
|
||||||
import io.element.android.features.call.api.CallData
|
import io.element.android.features.call.api.CallData
|
||||||
import io.element.android.features.call.impl.data.WidgetMessage
|
import io.element.android.features.call.impl.data.WidgetMessage
|
||||||
import io.element.android.features.call.impl.utils.ActiveCallManager
|
import io.element.android.features.call.impl.utils.ActiveCallManager
|
||||||
@@ -84,7 +83,7 @@ class CallScreenPresenter(
|
|||||||
var ignoreWebViewError by rememberSaveable { mutableStateOf(false) }
|
var ignoreWebViewError by rememberSaveable { mutableStateOf(false) }
|
||||||
var webViewError by remember { mutableStateOf<String?>(null) }
|
var webViewError by remember { mutableStateOf<String?>(null) }
|
||||||
val languageTag = languageTagProvider.provideLanguageTag()
|
val languageTag = languageTagProvider.provideLanguageTag()
|
||||||
val theme = if (ElementTheme.isLightTheme) "light" else "dark"
|
val theme = "dark"
|
||||||
|
|
||||||
DisposableEffect(Unit) {
|
DisposableEffect(Unit) {
|
||||||
coroutineScope.launch {
|
coroutineScope.launch {
|
||||||
|
|||||||
+21
-16
@@ -38,6 +38,7 @@ import androidx.core.view.WindowInsetsControllerCompat
|
|||||||
import androidx.lifecycle.Lifecycle
|
import androidx.lifecycle.Lifecycle
|
||||||
import dev.zacsweers.metro.Inject
|
import dev.zacsweers.metro.Inject
|
||||||
import io.element.android.compound.colors.SemanticColorsLightDark
|
import io.element.android.compound.colors.SemanticColorsLightDark
|
||||||
|
import io.element.android.compound.theme.ForcedDarkElementTheme
|
||||||
import io.element.android.features.call.api.CallData
|
import io.element.android.features.call.api.CallData
|
||||||
import io.element.android.features.call.impl.DefaultElementCallEntryPoint
|
import io.element.android.features.call.impl.DefaultElementCallEntryPoint
|
||||||
import io.element.android.features.call.impl.di.CallBindings
|
import io.element.android.features.call.impl.di.CallBindings
|
||||||
@@ -143,24 +144,28 @@ class ElementCallActivity :
|
|||||||
compoundDark = colors.dark,
|
compoundDark = colors.dark,
|
||||||
buildMeta = buildMeta,
|
buildMeta = buildMeta,
|
||||||
) {
|
) {
|
||||||
val state = presenter.present()
|
ForcedDarkElementTheme(
|
||||||
eventSink = state.eventSink
|
colors = colors,
|
||||||
LaunchedEffect(state.isCallActive) {
|
) {
|
||||||
if (state.isCallActive) {
|
val state = presenter.present()
|
||||||
setCallIsActive()
|
eventSink = state.eventSink
|
||||||
|
LaunchedEffect(state.isCallActive) {
|
||||||
|
if (state.isCallActive) {
|
||||||
|
setCallIsActive()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
CallScreenView(
|
||||||
|
state = state,
|
||||||
|
pipState = pipState,
|
||||||
|
onConsoleMessage = {
|
||||||
|
consoleMessageLogger.log("ElementCall", it)
|
||||||
|
},
|
||||||
|
requestPermissions = { permissions, callback ->
|
||||||
|
requestPermissionCallback = callback
|
||||||
|
requestPermissionsLauncher.launch(permissions)
|
||||||
|
}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
CallScreenView(
|
|
||||||
state = state,
|
|
||||||
pipState = pipState,
|
|
||||||
onConsoleMessage = {
|
|
||||||
consoleMessageLogger.log("ElementCall", it)
|
|
||||||
},
|
|
||||||
requestPermissions = { permissions, callback ->
|
|
||||||
requestPermissionCallback = callback
|
|
||||||
requestPermissionsLauncher.launch(permissions)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user