fix list card key value spacing (#152)

Co-authored-by: Siddharth Agarwal <[email protected]>
dhis2 · Nov 16, 2023 · aef4fc4 · aef4fc4
1 parent 0ef5291
commit aef4fc4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...gnsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCard.kt b/...gnsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCard.kt
@@ -415,19 +415,17 @@ private fun KeyValue(
                             )
                         }),
                 ) {
-                    Spacer(Modifier.size(Spacing4))
                     if (additionalInfoItem.icon != null) {
                         Box(
                             Modifier.background(color = Color.Transparent).size(InternalSizeValues.Size20),
                         ) {
                             additionalInfoItem.icon.invoke()
                         }
+                        Spacer(Modifier.size(Spacing4))
                     }
 
-                    Spacer(Modifier.size(Spacing4))
                     valueColor = if (additionalInfoItem.action != null) SurfaceColor.Primary else valueColor
                     ListCardValue(text = additionalInfoItem.value, color = valueColor)
-                    Spacer(Modifier.size(Spacing4))
                 }
             } else {
                 keyColor = additionalInfoItem.color ?: AdditionalInfoItemColor.DEFAULT_KEY.color

diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Text.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Text.kt
@@ -190,7 +190,7 @@ internal fun ListCardKey(
                     lineIndex = 0,
                     visibleEnd = true,
                 )
-                modifiedText = modifiedText.substring(0, lineIndex) + "...:"
+                modifiedText = modifiedText.substring(0, lineIndex).trimEnd() + "...:"
             }
         },
     )