From aeb50c6b684a39ccf5871cac2ca5f15596754de7 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Mon, 10 Mar 2025 13:32:20 +0100 Subject: [PATCH] fix to color status-bar with theming SetStatusBarColor() was called outside of the MaterialTheme() block Also, "surface" has to be used to get the 'light primary color' Signed-off-by: Marcel Hibbe --- .../java/com/nextcloud/talk/components/SetStatusBarColor.kt | 6 ++---- .../com/nextcloud/talk/contacts/ContactsActivityCompose.kt | 3 +-- .../java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/components/SetStatusBarColor.kt b/app/src/main/java/com/nextcloud/talk/components/SetStatusBarColor.kt index 2dfb67e23..3d8db4034 100644 --- a/app/src/main/java/com/nextcloud/talk/components/SetStatusBarColor.kt +++ b/app/src/main/java/com/nextcloud/talk/components/SetStatusBarColor.kt @@ -10,20 +10,18 @@ package com.nextcloud.talk.components import android.app.Activity import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.ui.graphics.toArgb - import androidx.compose.ui.platform.LocalView -import androidx.compose.ui.res.colorResource import androidx.core.view.WindowCompat -import com.nextcloud.talk.R @Composable fun SetStatusBarColor() { val view = LocalView.current val isDarkMod = isSystemInDarkTheme() - val statusBarColor = colorResource(R.color.bg_default).toArgb() + val statusBarColor = MaterialTheme.colorScheme.surface.toArgb() DisposableEffect(isDarkMod) { val activity = view.context as Activity diff --git a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt index f3cf47252..a2c727d1d 100644 --- a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt +++ b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt @@ -68,9 +68,8 @@ class ContactsActivityCompose : BaseActivity() { contactsViewModel = contactsViewModel, uiState = uiState.value ) + SetStatusBarColor() } - - SetStatusBarColor() } } } diff --git a/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt b/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt index 84354b287..3c75df41e 100644 --- a/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt @@ -117,9 +117,8 @@ class DiagnoseActivity : BaseActivity() { } } ) + SetStatusBarColor() } - - SetStatusBarColor() } }