From eb5be93d0db9975492ee47fa058df39525aca44f Mon Sep 17 00:00:00 2001 From: psuzn Date: Tue, 23 Jan 2024 13:35:06 +0545 Subject: [PATCH] fix: window insets --- .../me/sujanpoudel/playdeals/common/PlayDealApp.kt | 11 ----------- .../common/ui/components/common/ScaffoldToolbar.kt | 14 +++++++------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/shared/src/commonMain/kotlin/me/sujanpoudel/playdeals/common/PlayDealApp.kt b/shared/src/commonMain/kotlin/me/sujanpoudel/playdeals/common/PlayDealApp.kt index a076f94..861d451 100644 --- a/shared/src/commonMain/kotlin/me/sujanpoudel/playdeals/common/PlayDealApp.kt +++ b/shared/src/commonMain/kotlin/me/sujanpoudel/playdeals/common/PlayDealApp.kt @@ -2,12 +2,6 @@ package me.sujanpoudel.playdeals.common import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.WindowInsets -import androidx.compose.foundation.layout.navigationBars -import androidx.compose.foundation.layout.statusBars -import androidx.compose.foundation.layout.systemBars -import androidx.compose.foundation.layout.union -import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -98,11 +92,6 @@ fun PlayDealsApp() { Box( modifier = Modifier .background(MaterialTheme.colorScheme.background) - .windowInsetsPadding( - WindowInsets.navigationBars - .union(WindowInsets.statusBars) - .union(WindowInsets.systemBars), - ), ) { NavHost(navGraph) } diff --git a/shared/src/commonMain/kotlin/me/sujanpoudel/playdeals/common/ui/components/common/ScaffoldToolbar.kt b/shared/src/commonMain/kotlin/me/sujanpoudel/playdeals/common/ui/components/common/ScaffoldToolbar.kt index d435be3..9da3f5a 100644 --- a/shared/src/commonMain/kotlin/me/sujanpoudel/playdeals/common/ui/components/common/ScaffoldToolbar.kt +++ b/shared/src/commonMain/kotlin/me/sujanpoudel/playdeals/common/ui/components/common/ScaffoldToolbar.kt @@ -82,16 +82,16 @@ object ScaffoldToolbar { ) { val navigator = Navigator.current CenterAlignedTopAppBar( - modifier = modifier.windowInsetsPadding(WindowInsets(top = 10.dp)), + modifier = modifier.windowInsetsPadding(WindowInsets(top = 20.dp)), title = { ToolbarTitle(title) }, navigationIcon = - { - if (alwaysShowNavIcon || (showNavIcon && navigator.backStackCount.value > 1)) { - navigationIcon(navigator) - } - }, + { + if (alwaysShowNavIcon || (showNavIcon && navigator.backStackCount.value > 1)) { + navigationIcon(navigator) + } + }, actions = - { actions?.invoke(navigator) }, + { actions?.invoke(navigator) }, colors = TopAppBarDefaults.topAppBarColors( containerColor = Color.Transparent, ),