refactor: add LocalInSurface provided the padding in Navigation

This commit is contained in:
2023-12-02 10:33:40 +08:00
parent 5fff6801bf
commit bfa4558c8d

View File

@@ -55,7 +55,6 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.Role
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalColors
import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.LocalSizes
import com.highcapable.flexiui.extension.orElse import com.highcapable.flexiui.extension.orElse
@@ -239,8 +238,8 @@ private fun defaultNavigationColors() = NavigationColors(
@Composable @Composable
@ReadOnlyComposable @ReadOnlyComposable
private fun defaultNavigationStyle() = NavigationStyle( private fun defaultNavigationStyle() = NavigationStyle(
padding = when (LocalInAreaBox.current) { padding = when {
true -> PaddingValues(0.dp) LocalInSurface.current || LocalInAreaBox.current -> PaddingValues()
else -> PaddingValues( else -> PaddingValues(
horizontal = LocalSizes.current.spacingPrimary, horizontal = LocalSizes.current.spacingPrimary,
vertical = LocalSizes.current.spacingSecondary vertical = LocalSizes.current.spacingSecondary