Fix navigation drawer padding
This commit is contained in:
1 parent
2e5950a1a8
commit
6f87afc1bf
1 file changed
+7
-6
@@ -35,11 +35,11 @@ import androidx.compose.foundation.layout.ColumnScope
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.WindowInsetsSides
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.navigationBarsPadding
|
||||
import androidx.compose.foundation.layout.only
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.systemBars
|
||||
import androidx.compose.foundation.layout.widthIn
|
||||
import androidx.compose.foundation.layout.windowInsetsPadding
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.shape.CornerSize
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
@@ -146,7 +146,7 @@ private val navItems = arrayOf(
|
||||
)
|
||||
|
||||
class MainActivity : EhActivity() {
|
||||
private var sideSheet = mutableStateListOf<@Composable ColumnScope.(DrawerState2) -> Unit>()
|
||||
private val sideSheet = mutableStateListOf<@Composable ColumnScope.(DrawerState2) -> Unit>()
|
||||
|
||||
@Composable
|
||||
fun ProvideSideSheetContent(content: @Composable ColumnScope.(DrawerState2) -> Unit) {
|
||||
@@ -188,8 +188,8 @@ class MainActivity : EhActivity() {
|
||||
intentFlow.tryEmit(intent)
|
||||
}
|
||||
|
||||
private var tipFlow = MutableSharedFlow<String>(extraBufferCapacity = 1)
|
||||
private var intentFlow = MutableSharedFlow<Intent>(extraBufferCapacity = 4)
|
||||
private val tipFlow = MutableSharedFlow<String>(extraBufferCapacity = 1)
|
||||
private val intentFlow = MutableSharedFlow<Intent>(extraBufferCapacity = 4)
|
||||
|
||||
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
@@ -321,11 +321,12 @@ class MainActivity : EhActivity() {
|
||||
drawerContent = {
|
||||
ModalDrawerSheet(
|
||||
modifier = Modifier.widthIn(max = (configuration.screenWidthDp - 56).dp),
|
||||
windowInsets = WindowInsets(0, 0, 0, 0),
|
||||
windowInsets = WindowInsets.systemBars.only(WindowInsetsSides.Start),
|
||||
) {
|
||||
val scrollState = rememberScrollState()
|
||||
Column(
|
||||
modifier = Modifier.verticalScroll(scrollState).navigationBarsPadding(),
|
||||
modifier = Modifier.verticalScroll(scrollState)
|
||||
.windowInsetsPadding(WindowInsets.systemBars.only(WindowInsetsSides.Bottom)),
|
||||
) {
|
||||
Image(
|
||||
painter = painterResource(id = R.drawable.sadpanda_low_poly),
|
||||
|
||||
Reference in new issue
Block a user