From b26c31f29cb01c1ce1ce42a68ddb19f7529118b7 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Wed, 9 Apr 2025 17:15:40 +0300
Subject: [PATCH] Use background color in system bars

---
 app/src/main/kotlin/com/tutpro/baresip/AppTheme.kt     | 3 +++
 app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt | 2 +-
 app/src/main/kotlin/com/tutpro/baresip/CustomColors.kt | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/AppTheme.kt b/app/src/main/kotlin/com/tutpro/baresip/AppTheme.kt
index e58dc578..10515dde 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AppTheme.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AppTheme.kt
@@ -11,6 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.remember
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
@@ -47,6 +48,8 @@ fun AppTheme(
 
             // Handle the status bar appearance
             val insetsController = WindowCompat.getInsetsController(window, decorView)
+            window.statusBarColor = customColorsPalette.background.toArgb()
+            window.navigationBarColor = customColorsPalette.background.toArgb()
             insetsController.apply {
                 isAppearanceLightStatusBars = !darkTheme.value
                 isAppearanceLightNavigationBars = !darkTheme.value
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
index e7ac4df1..f6719799 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
@@ -150,7 +150,6 @@ class ChatActivity : ComponentActivity() {
                 keyboardController = LocalSoftwareKeyboardController.current
                 Surface(
                     modifier = Modifier.fillMaxSize(),
-                    color = LocalCustomColors.current.background
                 ) {
                     ChatScreen(this, title) { goBack() }
                 }
@@ -167,6 +166,7 @@ class ChatActivity : ComponentActivity() {
                 .fillMaxHeight()
                 .imePadding()
                 .safeDrawingPadding(),
+            containerColor = LocalCustomColors.current.background,
             topBar = { TopAppBar(ctx, title, navigateBack) },
             bottomBar = { NewMessage(ctx, peerUri) },
             content = { contentPadding ->
diff --git a/app/src/main/kotlin/com/tutpro/baresip/CustomColors.kt b/app/src/main/kotlin/com/tutpro/baresip/CustomColors.kt
index 49eb3c99..0f8d18b9 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/CustomColors.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/CustomColors.kt
@@ -59,7 +59,7 @@ val light_red = Color(0xffff0000)
 val light_traffic_green = Color(0xFF4CAF50)
 val light_traffic_yellow = Color(0xFFFFEB3B)
 val light_traffic_red = Color(0xFFFF5722)
-val light_light = light_white
+val light_light = Color(0xfffcfcfc)
 val light_dark = Color(0xFF383838)
 val light_spinner_text = light_dark
 val light_spinner_dropdown = light_gray_light
@@ -67,10 +67,10 @@ val light_spinner_divider = light_gray
 val light_item_text = light_black
 val light_alert_text = light_black
 val light_codec = light_black
-val light_background = Color(0xfffcfcfc)
+val light_background = light_light
 val light_textfield_background = light_gray_light
 val light_popup_background = light_secondary_dark
-val light_alert = Color(0xff0ca1fd) // == light_primary
+val light_alert = light_primary
 val light_actionbar = light_background
 
 val dark_primary = Color(0xff0073c9)