Merge pull request #118 from NordicPlayground/improvement/app-bar

Fixed insets and colors of `NordicAppBar`s
NordicPlayground · Dec 4, 2024 · 1f9dd50 · 1f9dd50
2 parents 06364d3 + 9cb55c5
commit 1f9dd50
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/ui/src/main/java/no/nordicsemi/android/common/ui/view/NordicAppBar.kt b/ui/src/main/java/no/nordicsemi/android/common/ui/view/NordicAppBar.kt
@@ -33,6 +33,12 @@ package no.nordicsemi.android.common.ui.view
 
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.displayCutout
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.union
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
@@ -66,7 +72,10 @@ fun NordicAppBar(
     backButtonIcon: ImageVector = Icons.AutoMirrored.Filled.ArrowBack,
     showHamburgerButton: Boolean = onHamburgerButtonClick != null,
     expandedHeight: Dp = TopAppBarDefaults.TopAppBarExpandedHeight,
-    windowInsets: WindowInsets = TopAppBarDefaults.windowInsets,
+    windowInsets: WindowInsets = WindowInsets.displayCutout
+        .union(WindowInsets.statusBars)
+        .union(WindowInsets.navigationBars)
+        .only(WindowInsetsSides.Horizontal + WindowInsetsSides.Top),
     scrollBehavior: TopAppBarScrollBehavior? = null,
     actions: @Composable RowScope.() -> Unit = {},
 ) {

diff --git a/ui/src/main/java/no/nordicsemi/android/common/ui/view/NordicLargeAppBar.kt b/ui/src/main/java/no/nordicsemi/android/common/ui/view/NordicLargeAppBar.kt
@@ -33,6 +33,12 @@ package no.nordicsemi.android.common.ui.view
 
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.displayCutout
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.union
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
@@ -67,7 +73,10 @@ fun NordicLargeAppBar(
     showHamburgerButton: Boolean = onHamburgerButtonClick != null,
     collapsedHeight: Dp = TopAppBarDefaults.LargeAppBarCollapsedHeight,
     expandedHeight: Dp = TopAppBarDefaults.LargeAppBarExpandedHeight,
-    windowInsets: WindowInsets = TopAppBarDefaults.windowInsets,
+    windowInsets: WindowInsets = WindowInsets.displayCutout
+            .union(WindowInsets.statusBars)
+            .union(WindowInsets.navigationBars)
+            .only(WindowInsetsSides.Horizontal + WindowInsetsSides.Top),
     scrollBehavior: TopAppBarScrollBehavior? = null,
     actions: @Composable RowScope.() -> Unit = {},
 ) {
@@ -76,6 +85,7 @@ fun NordicLargeAppBar(
         modifier = modifier,
         colors = TopAppBarDefaults.largeTopAppBarColors(
             containerColor = colorResource(id = R.color.appBarColor),
+            scrolledContainerColor = colorResource(id = R.color.appBarColor),
             titleContentColor = MaterialTheme.colorScheme.onPrimary,
             actionIconContentColor = MaterialTheme.colorScheme.onPrimary,
             navigationIconContentColor = MaterialTheme.colorScheme.onPrimary,

diff --git a/ui/src/main/java/no/nordicsemi/android/common/ui/view/NordicMediumAppBar.kt b/ui/src/main/java/no/nordicsemi/android/common/ui/view/NordicMediumAppBar.kt
@@ -33,6 +33,12 @@ package no.nordicsemi.android.common.ui.view
 
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.displayCutout
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.union
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
@@ -65,7 +71,10 @@ fun NordicMediumAppBar(
     showHamburgerButton: Boolean = onHamburgerButtonClick != null,
     collapsedHeight: Dp = TopAppBarDefaults.MediumAppBarCollapsedHeight,
     expandedHeight: Dp = TopAppBarDefaults.MediumAppBarExpandedHeight,
-    windowInsets: WindowInsets = TopAppBarDefaults.windowInsets,
+    windowInsets: WindowInsets = WindowInsets.displayCutout
+        .union(WindowInsets.statusBars)
+        .union(WindowInsets.navigationBars)
+        .only(WindowInsetsSides.Horizontal + WindowInsetsSides.Top),
     scrollBehavior: TopAppBarScrollBehavior? = null,
     actions: @Composable RowScope.() -> Unit = {},
 ) {