Update status bar colour of the app

dhis2 · Jul 23, 2024 · 6a78682 · 6a78682
1 parent 91fa0e4
commit 6a78682
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/android/src/main/java/org/hisp/dhis/android/MainActivity.kt b/android/src/main/java/org/hisp/dhis/android/MainActivity.kt
@@ -3,17 +3,22 @@ package org.hisp.dhis.android
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.os.Bundle
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalContext
+import androidx.core.view.WindowCompat
 import org.hisp.dhis.common.App
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
             val res = LocalContext.current.resources
+            SetStatusBarColor()
             App(
                 imageBitmapLoader = {
                     BitmapFactory.decodeResource(
@@ -27,3 +32,18 @@ class MainActivity : AppCompatActivity() {
         }
     }
 }
+
+@Composable
+fun SetStatusBarColor() {
+    val context = LocalContext.current
+    val window = (context as? ComponentActivity)?.window
+
+    SideEffect {
+        window?.let {
+            WindowCompat.getInsetsController(it, it.decorView).apply {
+                isAppearanceLightStatusBars = true
+            }
+            it.statusBarColor = 0xFFE2F2FF.toInt()
+        }
+    }
+}
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt
@@ -10,6 +10,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ImageBitmap
 import org.hisp.dhis.common.screens.Groups
 import org.hisp.dhis.common.screens.NoComponentSelectedScreen
@@ -33,6 +34,7 @@ import org.hisp.dhis.mobile.ui.designsystem.component.DropdownItem
 import org.hisp.dhis.mobile.ui.designsystem.component.InputDropDown
 import org.hisp.dhis.mobile.ui.designsystem.component.InputShellState
 import org.hisp.dhis.mobile.ui.designsystem.theme.DHIS2Theme
+import org.hisp.dhis.mobile.ui.designsystem.theme.Shape
 import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing
 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
@@ -95,7 +97,10 @@ fun Main(
                 Groups.NO_GROUP_SELECTED -> NoComponentSelectedScreen()
             }
         } else {
-            NoComponentSelectedScreen {
+            NoComponentSelectedScreen(
+                modifier = Modifier
+                    .background(Color.White, Shape.NoRounding)
+            ) {
                 isComponentSelected = !isComponentSelected
             }
         }

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/NoComponentSelectedScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/NoComponentSelectedScreen.kt
@@ -19,9 +19,11 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor
 
 @Composable
 fun NoComponentSelectedScreen(
+    modifier: Modifier = Modifier,
     onClick: (() -> Unit)? = null,
 ) {
     ColumnScreenContainer(
+        modifier = modifier,
         verticalArrangement = Arrangement.Top,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {