Skip to content

Commit ffb075b

Browse files
Fix app bar jumping (#1447)
1 parent 36e53f9 commit ffb075b

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

app/src/main/java/org/thoughtcrime/securesms/ui/components/ConversationAppBar.kt

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import androidx.compose.foundation.layout.Column
1212
import androidx.compose.foundation.layout.Row
1313
import androidx.compose.foundation.layout.Spacer
1414
import androidx.compose.foundation.layout.WindowInsets
15-
import androidx.compose.foundation.layout.asPaddingValues
1615
import androidx.compose.foundation.layout.fillMaxWidth
1716
import androidx.compose.foundation.layout.height
1817
import androidx.compose.foundation.layout.heightIn
1918
import androidx.compose.foundation.layout.padding
2019
import androidx.compose.foundation.layout.size
2120
import androidx.compose.foundation.layout.systemBars
2221
import androidx.compose.foundation.layout.width
22+
import androidx.compose.foundation.layout.windowInsetsTopHeight
2323
import androidx.compose.foundation.pager.HorizontalPager
2424
import androidx.compose.foundation.pager.PagerState
2525
import androidx.compose.foundation.pager.rememberPagerState
@@ -40,7 +40,6 @@ import androidx.compose.ui.draw.rotate
4040
import androidx.compose.ui.focus.FocusRequester
4141
import androidx.compose.ui.focus.focusRequester
4242
import androidx.compose.ui.graphics.ColorFilter
43-
import androidx.compose.ui.platform.LocalDensity
4443
import androidx.compose.ui.res.painterResource
4544
import androidx.compose.ui.res.stringResource
4645
import androidx.compose.ui.text.style.TextAlign
@@ -78,21 +77,14 @@ fun ConversationAppBar(
7877
onAvatarPressed: () -> Unit,
7978
modifier: Modifier = Modifier
8079
) {
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) {
8881
// cross fade between the default app bar and the search bar
8982
Crossfade(targetState = data.showSearch) { showSearch ->
9083
when(showSearch){
9184
false -> {
9285
val pagerState = rememberPagerState(pageCount = { data.pagerData.size })
9386

9487
CenterAlignedTopAppBar(
95-
windowInsets = WindowInsets(0, 0, 0, 0),
9688
title = {
9789
Column(
9890
horizontalAlignment = Alignment.CenterHorizontally
@@ -170,7 +162,9 @@ fun ConversationAppBar(
170162

171163
true -> {
172164
Row(
173-
modifier = Modifier.padding(horizontal = LocalDimensions.current.smallSpacing)
165+
modifier = Modifier
166+
.windowInsetsTopHeight(WindowInsets.systemBars)
167+
.padding(horizontal = LocalDimensions.current.smallSpacing)
174168
.heightIn(min = LocalDimensions.current.appBarHeight),
175169
verticalAlignment = Alignment.CenterVertically,
176170
) {

0 commit comments

Comments
 (0)