From cfa6e86002c19f566f36123e721ec9cc9cbaf59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Zolnai?= Date: Fri, 10 Jan 2025 13:56:26 +0100 Subject: [PATCH] TIQR-495: Fix status bar icon color --- app/src/main/kotlin/nl/eduid/MainComposeActivity.kt | 4 +++- app/src/main/kotlin/nl/eduid/screens/scan/ScanScreen.kt | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/nl/eduid/MainComposeActivity.kt b/app/src/main/kotlin/nl/eduid/MainComposeActivity.kt index cb62710..2c7c8ca 100644 --- a/app/src/main/kotlin/nl/eduid/MainComposeActivity.kt +++ b/app/src/main/kotlin/nl/eduid/MainComposeActivity.kt @@ -1,10 +1,12 @@ package nl.eduid import android.content.Intent +import android.graphics.Color import android.net.Uri import android.os.Bundle import android.widget.Toast import androidx.activity.ComponentActivity +import androidx.activity.SystemBarStyle import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.activity.viewModels @@ -22,7 +24,7 @@ class MainComposeActivity : ComponentActivity() { private var navController: NavHostController? = null override fun onCreate(savedInstanceState: Bundle?) { - enableEdgeToEdge() + enableEdgeToEdge(statusBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT)) super.onCreate(savedInstanceState) setContent { EduidAppAndroidTheme { diff --git a/app/src/main/kotlin/nl/eduid/screens/scan/ScanScreen.kt b/app/src/main/kotlin/nl/eduid/screens/scan/ScanScreen.kt index d26d20e..06c1f8b 100644 --- a/app/src/main/kotlin/nl/eduid/screens/scan/ScanScreen.kt +++ b/app/src/main/kotlin/nl/eduid/screens/scan/ScanScreen.kt @@ -65,7 +65,6 @@ fun ScanScreen( ) ) = Scaffold( modifier = Modifier - .systemBarsPadding() .onKeyEvent { keyEvent -> //This will only work if the screen has a focused child. Which will prompt they keyboard. //The other solution is to listen to key events on the MainComposeActivity but then we need to learn the currently displayed screen,