@@ -47,10 +47,8 @@ import androidx.compose.foundation.layout.fillMaxSize
4747import androidx.compose.foundation.layout.fillMaxWidth
4848import androidx.compose.foundation.layout.height
4949import androidx.compose.foundation.layout.navigationBars
50- import androidx.compose.foundation.layout.navigationBarsPadding
5150import androidx.compose.foundation.layout.padding
5251import androidx.compose.foundation.layout.size
53- import androidx.compose.foundation.layout.statusBarsPadding
5452import androidx.compose.foundation.shape.RoundedCornerShape
5553import androidx.compose.material.icons.Icons
5654import androidx.compose.material.icons.automirrored.filled.ArrowBack
@@ -100,7 +98,6 @@ import androidx.compose.ui.semantics.semantics
10098import androidx.compose.ui.text.font.FontWeight
10199import androidx.compose.ui.text.style.TextOverflow
102100import androidx.compose.ui.tooling.preview.Preview
103- import androidx.compose.ui.unit.Dp
104101import androidx.compose.ui.unit.DpSize
105102import androidx.compose.ui.unit.dp
106103import androidx.compose.ui.unit.sp
@@ -373,7 +370,7 @@ internal fun DefaultBottomAppBar(
373370 targetValue = if (loading) LOADING_ALPHA else VISIBLE_ALPHA ,
374371 animationSpec = tween(durationMillis = SLOW_ANIMATION_MS ),
375372 )
376- val heightModifier = if (button == null ) {
373+ val heightModifier = if (button == null || ! showButton ) {
377374 Modifier .height(WindowInsets .navigationBars.getBottom(LocalDensity .current).pxToDp())
378375 } else {
379376 Modifier .defaultMinSize()
@@ -383,10 +380,9 @@ internal fun DefaultBottomAppBar(
383380 containerColor = backgroundColor.value,
384381 contentPadding = PaddingValues (0 .dp),
385382 modifier = heightModifier.graphicsLayer(alpha = alpha),
386- windowInsets = WindowInsets .navigationBars,
387383 ) {
388384 AnimatedVisibility (
389- visible = showButton && (button != null ) ,
385+ visible = showButton,
390386 enter = fadeIn(animationSpec = tween(durationMillis = SLOW_ANIMATION_MS )),
391387 exit = fadeOut(animationSpec = tween(durationMillis = SLOW_ANIMATION_MS )),
392388 ) {
0 commit comments