From 89b0198fdf3f56c3a68a5842a1a3ac0701d0fdb9 Mon Sep 17 00:00:00 2001 From: andresmr Date: Tue, 14 Jan 2025 13:40:24 +0100 Subject: [PATCH] docs: Update documentation version and URL --- .../component/table/ui/internal/Table.kt | 4 ++-- .../component/table/ui/internal/TableActions.kt | 12 ++---------- .../component/table/ui/internal/TableHeaderRow.kt | 4 ++-- .../component/table/ui/internal/TableItemRow.kt | 1 - .../table/ui/internal/VerticalResizing.kt | 15 ++++++++------- .../dhis/mobile/ui/designsystem/theme/Spacing.kt | 1 + 6 files changed, 15 insertions(+), 22 deletions(-) diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/Table.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/Table.kt index bfef0d7a7..194f3b23d 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/Table.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/Table.kt @@ -15,7 +15,6 @@ import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -39,6 +38,7 @@ import org.hisp.dhis.mobile.ui.designsystem.component.table.ui.TableTheme import org.hisp.dhis.mobile.ui.designsystem.component.table.ui.TableTheme.tableSelection import org.hisp.dhis.mobile.ui.designsystem.component.table.ui.compositions.LocalTableResizeActions import org.hisp.dhis.mobile.ui.designsystem.component.table.ui.internal.extensions.fixedStickyHeader +import org.hisp.dhis.mobile.ui.designsystem.theme.Shape /** * Composable function to display a table. @@ -68,7 +68,7 @@ internal fun Table( modifier = Modifier .fillMaxSize() .background(Color.White) - .clip(RoundedCornerShape(8.dp)), + .clip(Shape.Small), ) { val resizeActions = LocalTableResizeActions.current var tableHeight: Int? by remember { mutableStateOf(null) } diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableActions.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableActions.kt index c7d105bdd..9aa3f85ac 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableActions.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableActions.kt @@ -5,15 +5,12 @@ import androidx.compose.foundation.layout.Row import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.TableView import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import org.hisp.dhis.mobile.ui.designsystem.component.table.ui.TableTheme /** @@ -39,12 +36,7 @@ internal fun TableActions(modifier: Modifier, title: String, actionIcons: @Compo Text( modifier = Modifier.weight(1f), text = title, - style = TextStyle( - color = Color.Black, - fontSize = 14.sp, - fontWeight = FontWeight.Normal, - lineHeight = 10.sp, - ), + style = MaterialTheme.typography.bodyMedium, ) actionIcons() } diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableHeaderRow.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableHeaderRow.kt index bc6ddd485..d99c5b583 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableHeaderRow.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableHeaderRow.kt @@ -10,13 +10,13 @@ import androidx.compose.material3.Icon import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import org.hisp.dhis.mobile.ui.designsystem.component.IconButton import org.hisp.dhis.mobile.ui.designsystem.component.table.model.TableModel import org.hisp.dhis.mobile.ui.designsystem.component.table.model.internal.ResizingCell import org.hisp.dhis.mobile.ui.designsystem.component.table.model.internal.TableCornerUiState import org.hisp.dhis.mobile.ui.designsystem.component.table.ui.TableTheme +import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing /** * Composable function to display the table header row. @@ -56,7 +56,7 @@ internal fun TableHeaderRow( if (isHeaderActionEnabled) { TableActions( modifier = Modifier - .padding(bottom = 24.dp), + .padding(bottom = Spacing.Spacing24), title = tableModel.title, actionIcons = { if (TableTheme.dimensions.hasOverriddenWidths(tableModel.id ?: "")) { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableItemRow.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableItemRow.kt index 6815a839b..126b52a6b 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableItemRow.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableItemRow.kt @@ -87,7 +87,6 @@ internal fun TableItemRow( ) } if (!rowModel.isLastRow) { - // TODO review if new divider is implemented correctly HorizontalDivider( modifier = Modifier .fillMaxWidth() diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/VerticalResizing.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/VerticalResizing.kt index 5687e0cf1..fd871c7fa 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/VerticalResizing.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/VerticalResizing.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Expand import androidx.compose.material3.Icon @@ -32,6 +31,8 @@ import androidx.compose.ui.unit.dp import org.hisp.dhis.mobile.ui.designsystem.component.table.model.internal.ResizingCell import org.hisp.dhis.mobile.ui.designsystem.component.table.ui.TableDimensions import org.hisp.dhis.mobile.ui.designsystem.component.table.ui.TableTheme +import org.hisp.dhis.mobile.ui.designsystem.theme.Shape +import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import kotlin.math.abs import kotlin.math.roundToInt @@ -64,9 +65,9 @@ internal fun VerticalResizingView(modifier: Modifier = Modifier, provideResizing } .background( color = colorPrimary, - shape = RoundedCornerShape(16.dp), + shape = Shape.Large, ) - .size(14.dp), + .size(Spacing.Spacing14), imageVector = Icons.Outlined.Expand, contentDescription = "", tint = Color.White, @@ -92,8 +93,8 @@ internal fun VerticalResizingRule( Box( modifier .fillMaxHeight() - .width(48.dp) - .offset(24.dp) + .width(Spacing.Spacing48) + .offset(Spacing.Spacing24) .pointerInput(Unit) { detectDragGestures( onDragEnd = { @@ -117,9 +118,9 @@ internal fun VerticalResizingRule( .align(Alignment.Center) .background( color = TableTheme.colors.primary, - shape = RoundedCornerShape(16.dp), + shape = Shape.Large, ) - .size(14.dp) + .size(Spacing.Spacing14) .onGloballyPositioned { coordinates -> positionInRoot = coordinates.positionInRoot() }, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Spacing.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Spacing.kt index 89f2a71e3..1a8d58b73 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Spacing.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Spacing.kt @@ -13,6 +13,7 @@ object Spacing { val Spacing10: Dp = 10.dp val Spacing11: Dp = 11.dp val Spacing12: Dp = 12.dp + val Spacing14: Dp = 14.dp val Spacing16: Dp = 16.dp val Spacing18: Dp = 18.dp val Spacing24: Dp = 24.dp