Added the inner padding config in CompoundText (#3589)

* Added the inner padding config in CompoundText * Unit Tests
opensrp · Nov 15, 2024 · 2b53916 · 2b53916
1 parent 16d027d
commit 2b53916
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.../main/java/org/smartregister/fhircore/engine/configuration/view/CompoundTextProperties.kt b/.../main/java/org/smartregister/fhircore/engine/configuration/view/CompoundTextProperties.kt
@@ -55,6 +55,7 @@ data class CompoundTextProperties(
   val textCase: TextCase? = null,
   val overflow: TextOverFlow? = null,
   val letterSpacing: Int = 0,
+  val textInnerPadding: Int = 0,
 ) : ViewProperties(), Parcelable {
   override fun interpolate(computedValuesMap: Map<String, Any>): CompoundTextProperties {
     return this.copy(

diff --git a/...ava/org/smartregister/fhircore/quest/integration/ui/shared/components/CompoundTextTest.kt b/...ava/org/smartregister/fhircore/quest/integration/ui/shared/components/CompoundTextTest.kt
@@ -45,6 +45,8 @@ class CompoundTextTest {
             primaryTextColor = "#000000",
             primaryTextFontWeight = TextFontWeight.SEMI_BOLD,
             padding = 16,
+            primaryTextBackgroundColor = "#FFA500",
+            textInnerPadding = 4,
           ),
         resourceData = ResourceData("id", ResourceType.Patient, emptyMap(), emptyMap()),
         navController = TestNavHostController(LocalContext.current),
@@ -67,6 +69,7 @@ class CompoundTextTest {
             separator = ".",
             secondaryTextBackgroundColor = "#FFA500",
             fontSize = 18.0f,
+            textInnerPadding = 4,
           ),
         resourceData = ResourceData("id", ResourceType.Patient, emptyMap(), emptyMap()),
         navController = TestNavHostController(LocalContext.current),

diff --git a/...quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/components/CompoundText.kt b/...quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/components/CompoundText.kt
@@ -97,6 +97,7 @@ fun CompoundText(
           navController = navController,
           overflow = compoundTextProperties.overflow,
           letterSpacing = compoundTextProperties.letterSpacing,
+          textInnerPadding = compoundTextProperties.textInnerPadding,
         )
       }
       // Separate the primary and secondary text
@@ -128,6 +129,7 @@ fun CompoundText(
           resourceData = resourceData,
           overflow = compoundTextProperties.overflow,
           letterSpacing = compoundTextProperties.letterSpacing,
+          textInnerPadding = compoundTextProperties.textInnerPadding,
         )
       }
     }
@@ -153,6 +155,7 @@ private fun CompoundTextPart(
   resourceData: ResourceData,
   overflow: TextOverFlow?,
   letterSpacing: Int = 0,
+  textInnerPadding: Int = 0,
 ) {
   Text(
     text =
@@ -175,7 +178,7 @@ private fun CompoundTextPart(
         )
         .clip(RoundedCornerShape(borderRadius.dp))
         .background(backgroundColor.parseColor())
-        .padding(0.dp),
+        .padding(textInnerPadding.dp),
     fontSize = fontSize.sp,
     fontWeight = textFontWeight.fontWeight,
     textAlign =