feat: [ANDROAPP-6693] Compose table migration #336
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andresmr
force-pushed
the
ANDROAPP-6693-move-table-to-design-system
branch
from
a1dc252 to
d9cbc3d
Compare
andresmr
force-pushed
the
ANDROAPP-6693-move-table-to-design-system
branch
from
3fb51ff to
accc167
Compare
andresmr
approved these changes
Jan 13, 2025
xavimolloy
commented
Jan 14, 2025
...mmonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/model/DropdownOption.kt
Show resolved
Hide resolved
...c/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/model/TableModel.kt
Outdated
Show resolved
Hide resolved
...src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/TableColors.kt
Show resolved
Hide resolved
...commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/TableDimensions.kt
Outdated
Show resolved
Hide resolved
| textColor = LocalTableColors.current.headerText, | ||
| ) | ||
| columnIndex % 2 == 0 -> CellStyle.HeaderStyle( | ||
| backgroundColor = LocalTableColors.current.headerBackground1, |
There was a problem hiding this comment.
I think we could improve this naming for the headerBackground1 and 2 to something like primary and secondaryHeaderBackground
...Main/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableActions.kt
Outdated
Show resolved
Hide resolved
...in/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableHeaderRow.kt
Show resolved
Hide resolved
...in/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableHeaderRow.kt
Outdated
Show resolved
Hide resolved
...Main/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/TableItemRow.kt
Outdated
Show resolved
Hide resolved
.../kotlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/VerticalResizing.kt
Outdated
Show resolved
Hide resolved
xavimolloy
commented
Jan 14, 2025
ferdyrod
reviewed
Jan 14, 2025
Comment on lines
+40
to
+68
| data class TableDimensions( | ||
| val tableHorizontalPadding: Dp = Spacing.Spacing16, | ||
| val tableVerticalPadding: Dp = Spacing.Spacing16, | ||
| val defaultCellWidth: Int = 160, | ||
| val defaultCellHeight: Dp = Spacing.Spacing36, | ||
| val defaultRowHeaderWidth: Int = 275, | ||
| val defaultHeaderHeight: Int = 36, | ||
| val defaultLegendCornerSize: Dp = Spacing.Spacing2, | ||
| val defaultLegendBorderWidth: Dp = Spacing.Spacing8, | ||
| val defaultHeaderTextSize: TextUnit = 12.sp, | ||
| val defaultRowHeaderTextSize: TextUnit = 12.sp, | ||
| val defaultCellTextSize: TextUnit = 12.sp, | ||
| val totalWidth: Int = 0, | ||
| val cellVerticalPadding: Dp = Spacing.Spacing4, | ||
| val cellHorizontalPadding: Dp = Spacing.Spacing4, | ||
| val headerCellPaddingValues: PaddingValues = PaddingValues( | ||
| horizontal = Spacing.Spacing4, | ||
| vertical = Spacing.Spacing11, | ||
| ), | ||
| val tableBottomPadding: Dp = Spacing.Spacing200, | ||
| val extraWidths: Map<String, Int> = emptyMap(), | ||
| val rowHeaderWidths: Map<String, Int> = emptyMap(), | ||
| val columnWidth: Map<String, Map<Int, Int>> = emptyMap(), | ||
| val minRowHeaderWidth: Int = 130, | ||
| val minColumnWidth: Int = 130, | ||
| val maxRowHeaderWidth: Int = Int.MAX_VALUE, | ||
| val maxColumnWidth: Int = Int.MAX_VALUE, | ||
| val tableEndExtraScroll: Dp = Spacing.Spacing6, | ||
| ) { |
There was a problem hiding this comment.
Could these be too much properties on the data class, maybe they could be grouped someway. Maybe reducing the amount of properties needed. What do you think?
There was a problem hiding this comment.
I agree, this issue is just a migration to validate proper work of the table. Maybe we could improve it in the future
ferdyrod
reviewed
Jan 14, 2025
| } | ||
|
|
||
| private fun updateAllWidthBy(tableId: String, widthOffset: Float): TableDimensions { | ||
| val newWidth = (extraWidths[tableId] ?: 0) + widthOffset - 11 |
There was a problem hiding this comment.
What does 11 represent? why not 12 or 10?
ferdyrod
reviewed
Jan 14, 2025
| val newWidth = ( | ||
| columnWidth[tableId]?.get(column) | ||
| ?: (defaultCellWidth + (currentExtraSize[tableId] ?: 0)) | ||
| ) + widthOffset - 11 |
ferdyrod
reviewed
Jan 14, 2025
...tlin/org/hisp/dhis/mobile/ui/designsystem/component/table/ui/internal/MultiOptionSelector.kt
Outdated
Show resolved
Hide resolved
andresmr
force-pushed
the
ANDROAPP-6693-move-table-to-design-system
branch
from
89b0198 to
5bc178d
Compare
ferdyrod
approved these changes
Jan 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.