diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-05-31 09:46:20 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-06-01 12:03:31 +0200 |
| commit | deecc8be99b9b86643366933a22535cc38625b95 (patch) | |
| tree | 1f4f56cbb6331cce7cd4bf64ba21c79a0967b08b | |
| parent | 152a51cf6bd646dc70a96c9de01c7e6389e0f3c6 (diff) | |
| download | mullvadvpn-deecc8be99b9b86643366933a22535cc38625b95.tar.xz mullvadvpn-deecc8be99b9b86643366933a22535cc38625b95.zip | |
Order dimensions alphabetically
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SpacedColumn.kt | 19 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/dimensions/Dimensions.kt | 22 |
2 files changed, 30 insertions, 11 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SpacedColumn.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SpacedColumn.kt new file mode 100644 index 0000000000..350cb6b80c --- /dev/null +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SpacedColumn.kt @@ -0,0 +1,19 @@ +package net.mullvad.mullvadvpn.compose.cell + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp + +@Composable +fun SpacedColumn( + spacing: Dp = 1.dp, + alignment: Alignment.Vertical = Alignment.Bottom, + content: @Composable ColumnScope.() -> Unit +) { + Column(verticalArrangement = Arrangement.spacedBy(spacing, alignment), content = content) +} diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/dimensions/Dimensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/dimensions/Dimensions.kt index a017b6e4b2..a4bcf31a14 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/dimensions/Dimensions.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/dimensions/Dimensions.kt @@ -4,23 +4,23 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp data class Dimensions( - val mediumPadding: Dp = 16.dp, - val smallPadding: Dp = 8.dp, + val cellEndPadding: Dp = 16.dp, + val cellFooterTopPadding: Dp = 6.dp, + val cellHeight: Dp = 52.dp, + val cellLabelVerticalPadding: Dp = 14.dp, + val cellStartPadding: Dp = 22.dp, + val indentedCellStartPadding: Dp = 38.dp, + val listIconSize: Dp = 24.dp, val listItemDivider: Dp = 1.dp, val listItemHeight: Dp = 50.dp, val listItemHeightExtra: Dp = 60.dp, + val loadingSpinnerPadding: Dp = 12.dp, val loadingSpinnerSize: Dp = 24.dp, val loadingSpinnerStrokeWidth: Dp = 3.dp, - val loadingSpinnerPadding: Dp = 12.dp, - val cellStartPadding: Dp = 22.dp, - val cellEndPadding: Dp = 16.dp, - val listIconSize: Dp = 24.dp, + val mediumPadding: Dp = 16.dp, val progressIndicatorSize: Dp = 60.dp, - val indentedCellStartPadding: Dp = 38.dp, - val cellHeight: Dp = 52.dp, - val cellLabelVerticalPadding: Dp = 14.dp, - val cellFooterTopPadding: Dp = 6.dp, - val selectableCellTextMargin: Dp = 12.dp + val selectableCellTextMargin: Dp = 12.dp, + val smallPadding: Dp = 8.dp ) val defaultDimensions = Dimensions() |