Ensure PinUnlockActivity and IncomingCallActivity use the internal theme set by the user.

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallActivity.kt

@@ -20,8 +20,15 @@ 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 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.call.api.CallType
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.features.call.impl.di.CallBindings
@@ -29,6 +36,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.libraries.architecture.bindings
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -51,6 +59,9 @@ class IncomingCallActivity : AppCompatActivity() {
     @Inject
     lateinit var activeCallManager: ActiveCallManager
 
+    @Inject
+    lateinit var appPreferencesStore: AppPreferencesStore
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -68,12 +79,20 @@ class IncomingCallActivity : AppCompatActivity() {
         val notificationData = intent?.let { IntentCompat.getParcelableExtra(it, EXTRA_NOTIFICATION_DATA, CallNotificationData::class.java) }
         if (notificationData != null) {
             setContent {
+                val theme by remember {
+                    appPreferencesStore.getThemeFlow().mapToTheme()
+                }
+                    .collectAsState(initial = Theme.System)
+                ElementTheme(
+                    darkTheme = theme.isDark()
+                ) {
                     IncomingCallScreen(
                         notificationData = notificationData,
                         onAnswer = ::onAnswer,
                         onCancel = ::onCancel,
                     )
                 }
+            }
         } else {
             // No data, finish the activity
             finish()

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallScreen.kt

@@ -64,7 +64,6 @@ internal fun IncomingCallScreen(
     onAnswer: (CallNotificationData) -> Unit,
     onCancel: () -> Unit,
 ) {
-    ElementTheme {
     OnboardingBackground()
     Column(
         modifier = Modifier.fillMaxSize(),
@@ -126,7 +125,6 @@ internal fun IncomingCallScreen(
             )
         }
     }
-    }
 }
 
 @Composable
@@ -145,7 +143,8 @@ private fun ActionButton(
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         FilledIconButton(
-            modifier = Modifier.size(size + borderSize)
+            modifier = Modifier
+                .size(size + borderSize)
                 .border(borderSize, borderColor, CircleShape),
             onClick = onClick,
             colors = IconButtonDefaults.filledIconButtonColors(
@@ -171,8 +170,7 @@ private fun ActionButton(
 
 @PreviewsDayNight
 @Composable
-internal fun IncomingCallScreenPreview() {
+internal fun IncomingCallScreenPreview() = ElementPreview {
-    ElementPreview {
     IncomingCallScreen(
         notificationData = CallNotificationData(
             sessionId = SessionId("@alice:matrix.org"),
@@ -188,5 +186,4 @@ internal fun IncomingCallScreenPreview() {
         onAnswer = {},
         onCancel = {},
     )
-    }
 }

features/lockscreen/impl/build.gradle.kts

@@ -40,6 +40,7 @@ dependencies {
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.featureflag.api)
     implementation(projects.libraries.cryptography.api)
+    implementation(projects.libraries.preferences.api)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.sessionStorage.api)
     implementation(projects.services.appnavstate.api)

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/activity/PinUnlockActivity.kt

@@ -23,14 +23,21 @@ 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 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.lockscreen.api.LockScreenLockState
 import io.element.android.features.lockscreen.api.LockScreenService
 import io.element.android.features.lockscreen.impl.unlock.PinUnlockPresenter
 import io.element.android.features.lockscreen.impl.unlock.PinUnlockView
 import io.element.android.features.lockscreen.impl.unlock.di.PinUnlockBindings
 import io.element.android.libraries.architecture.bindings
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -43,13 +50,20 @@ class PinUnlockActivity : AppCompatActivity() {
 
     @Inject lateinit var presenter: PinUnlockPresenter
     @Inject lateinit var lockScreenService: LockScreenService
+    @Inject lateinit var appPreferencesStore: AppPreferencesStore
 
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         bindings<PinUnlockBindings>().inject(this)
         setContent {
-            ElementTheme {
+            val theme by remember {
+                appPreferencesStore.getThemeFlow().mapToTheme()
+            }
+                .collectAsState(initial = Theme.System)
+            ElementTheme(
+                darkTheme = theme.isDark()
+            ) {
                 val state = presenter.present()
                 PinUnlockView(state = state, isInAppUnlock = false)
             }