diff --git a/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/bottomSheet/BottomSheetUtils.kt b/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/bottomSheet/BottomSheetUtils.kt index 960593a5f..436a83833 100644 --- a/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/bottomSheet/BottomSheetUtils.kt +++ b/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/bottomSheet/BottomSheetUtils.kt @@ -5,8 +5,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext -//TODO - hack to get navigation bar padding does not take into account IME padding (reflection) -//TODO - Should be remove when google publish https://issuetracker.google.com/issues/274872542 +// TODO - hack to get navigation bar padding does not take into account IME padding (reflection) +// TODO - Should be remove when google publish https://issuetracker.google.com/issues/274872542 @Composable @SuppressLint("DiscouragedApi") actual fun rememberDimensionByName(name: String): Int { @@ -15,4 +15,4 @@ actual fun rememberDimensionByName(name: String): Int { val id = resources.getIdentifier(name, "dimen", "android") if (id == 0) 0 else resources.getDimensionPixelSize(id) } -} \ No newline at end of file +} diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BottomSheet.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BottomSheet.kt index 09c244744..76ed519df 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BottomSheet.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BottomSheet.kt @@ -161,9 +161,8 @@ fun BottomSheetShell( ) { val sheetState = rememberModalBottomSheetState(true) val scope = rememberCoroutineScope() - - //TODO - hack to get navigation bar padding does not take into account IME padding (reflection) - //TODO - Should be remove when google publish https://issuetracker.google.com/issues/274872542 + // TODO - hack to get navigation bar padding does not take into account IME padding (reflection) + // TODO - Should be remove when google publish https://issuetracker.google.com/issues/274872542 val topInsets = WindowInsets(top = rememberDimensionByName("status_bar_height")) val bottomInsets = WindowInsets(bottom = rememberDimensionByName("navigation_bar_height")) @@ -195,13 +194,13 @@ fun BottomSheetShell( } } }, - windowInsets = topInsets + windowInsets = topInsets, ) { val canScrollForward by derivedStateOf { contentScrollState.canScrollForward } Column( modifier = Modifier - .padding(bottomInsets.asPaddingValues()) + .padding(bottomInsets.asPaddingValues()), ) { Column( modifier = Modifier diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/bottomSheet/BottomSheetUtils.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/bottomSheet/BottomSheetUtils.kt index 1539758fa..798cae28b 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/bottomSheet/BottomSheetUtils.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/bottomSheet/BottomSheetUtils.kt @@ -2,8 +2,8 @@ package org.hisp.dhis.mobile.ui.designsystem.component.internal.bottomSheet import androidx.compose.runtime.Composable -//TODO - hack to get navigation bar padding does not take into account IME padding (reflection) -//TODO - Should be remove when google publish https://issuetracker.google.com/issues/274872542 +// TODO - hack to get navigation bar padding does not take into account IME padding (reflection) +// TODO - Should be remove when google publish https://issuetracker.google.com/issues/274872542 @Composable -expect fun rememberDimensionByName(name: String): Int \ No newline at end of file +expect fun rememberDimensionByName(name: String): Int diff --git a/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/bottomSheet/BottomSheetUtils.kt b/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/bottomSheet/BottomSheetUtils.kt index e8e860ab3..bcd5922d6 100644 --- a/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/bottomSheet/BottomSheetUtils.kt +++ b/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/bottomSheet/BottomSheetUtils.kt @@ -2,7 +2,7 @@ package org.hisp.dhis.mobile.ui.designsystem.component.internal.bottomSheet import androidx.compose.runtime.Composable -//TODO - hack to get navigation bar padding does not take into account IME padding -//TODO - Should be remove when google published https://issuetracker.google.com/issues/274872542 +// TODO - hack to get navigation bar padding does not take into account IME padding +// TODO - Should be remove when google published https://issuetracker.google.com/issues/274872542 @Composable -actual fun rememberDimensionByName(name: String) = 0 \ No newline at end of file +actual fun rememberDimensionByName(name: String) = 0