@@ -12,14 +12,14 @@ import androidx.compose.foundation.layout.Column
12
12
import androidx.compose.foundation.layout.Row
13
13
import androidx.compose.foundation.layout.Spacer
14
14
import androidx.compose.foundation.layout.WindowInsets
15
- import androidx.compose.foundation.layout.asPaddingValues
16
15
import androidx.compose.foundation.layout.fillMaxWidth
17
16
import androidx.compose.foundation.layout.height
18
17
import androidx.compose.foundation.layout.heightIn
19
18
import androidx.compose.foundation.layout.padding
20
19
import androidx.compose.foundation.layout.size
21
20
import androidx.compose.foundation.layout.systemBars
22
21
import androidx.compose.foundation.layout.width
22
+ import androidx.compose.foundation.layout.windowInsetsTopHeight
23
23
import androidx.compose.foundation.pager.HorizontalPager
24
24
import androidx.compose.foundation.pager.PagerState
25
25
import androidx.compose.foundation.pager.rememberPagerState
@@ -40,7 +40,6 @@ import androidx.compose.ui.draw.rotate
40
40
import androidx.compose.ui.focus.FocusRequester
41
41
import androidx.compose.ui.focus.focusRequester
42
42
import androidx.compose.ui.graphics.ColorFilter
43
- import androidx.compose.ui.platform.LocalDensity
44
43
import androidx.compose.ui.res.painterResource
45
44
import androidx.compose.ui.res.stringResource
46
45
import androidx.compose.ui.text.style.TextAlign
@@ -78,21 +77,14 @@ fun ConversationAppBar(
78
77
onAvatarPressed : () -> Unit ,
79
78
modifier : Modifier = Modifier
80
79
) {
81
- val statusBarHeight = with (LocalDensity .current) {
82
- WindowInsets .systemBars.asPaddingValues().calculateTopPadding()
83
- }
84
-
85
- Box (
86
- modifier = modifier.padding(top = statusBarHeight)
87
- ) {
80
+ Box (modifier = modifier) {
88
81
// cross fade between the default app bar and the search bar
89
82
Crossfade (targetState = data.showSearch) { showSearch ->
90
83
when (showSearch){
91
84
false -> {
92
85
val pagerState = rememberPagerState(pageCount = { data.pagerData.size })
93
86
94
87
CenterAlignedTopAppBar (
95
- windowInsets = WindowInsets (0 , 0 , 0 , 0 ),
96
88
title = {
97
89
Column (
98
90
horizontalAlignment = Alignment .CenterHorizontally
@@ -170,7 +162,9 @@ fun ConversationAppBar(
170
162
171
163
true -> {
172
164
Row (
173
- modifier = Modifier .padding(horizontal = LocalDimensions .current.smallSpacing)
165
+ modifier = Modifier
166
+ .windowInsetsTopHeight(WindowInsets .systemBars)
167
+ .padding(horizontal = LocalDimensions .current.smallSpacing)
174
168
.heightIn(min = LocalDimensions .current.appBarHeight),
175
169
verticalAlignment = Alignment .CenterVertically ,
176
170
) {
0 commit comments