Skip to content

Commit c1cf132

Browse files
committed
Cleanup.
1 parent a19a6cd commit c1cf132

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

  • libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/components

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/components/LoginView.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,8 @@ import androidx.compose.foundation.layout.fillMaxSize
4747
import androidx.compose.foundation.layout.fillMaxWidth
4848
import androidx.compose.foundation.layout.height
4949
import androidx.compose.foundation.layout.navigationBars
50-
import androidx.compose.foundation.layout.navigationBarsPadding
5150
import androidx.compose.foundation.layout.padding
5251
import androidx.compose.foundation.layout.size
53-
import androidx.compose.foundation.layout.statusBarsPadding
5452
import androidx.compose.foundation.shape.RoundedCornerShape
5553
import androidx.compose.material.icons.Icons
5654
import androidx.compose.material.icons.automirrored.filled.ArrowBack
@@ -100,7 +98,6 @@ import androidx.compose.ui.semantics.semantics
10098
import androidx.compose.ui.text.font.FontWeight
10199
import androidx.compose.ui.text.style.TextOverflow
102100
import androidx.compose.ui.tooling.preview.Preview
103-
import androidx.compose.ui.unit.Dp
104101
import androidx.compose.ui.unit.DpSize
105102
import androidx.compose.ui.unit.dp
106103
import 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

Comments
 (0)