Fix QuestionnaireItem's title styling in Header, for compose (#2901)

* Fix compose Header space padding

* Apply default styling for AndroidView in Header

* Rename applyDefaultStyleIfNotApplied to better fit applyDefaultStyle

Author: LZRS

datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionItemStyle.kt

@@ -48,7 +48,7 @@ internal fun applyCustomOrDefaultStyle(
       QuestionItemCustomStyle().applyStyle(context, view, customStyleResId)
     }
     defaultStyleResId != 0 -> {
-      applyDefaultStyleIfNotApplied(context, view, defaultStyleResId)
+      applyDefaultStyle(context, view, defaultStyleResId)
     }
   }
 }
@@ -60,7 +60,7 @@ internal fun applyCustomOrDefaultStyle(
  * @param view The view to which the default style will be applied.
  * @param defaultStyleResId The resource ID of the default style to apply.
  */
-private fun applyDefaultStyleIfNotApplied(
+private fun applyDefaultStyle(
   context: Context,
   view: View,
   defaultStyleResId: Int,

datacapture/src/main/java/com/google/android/fhir/datacapture/views/compose/Header.kt

@@ -136,14 +136,16 @@ internal fun Header(
   ) {
     PrefixQuestionTitle(prefixLocalizedText, questionLocalizedText, readCustomStyleName)
 
-    Help(
-      hintLocalizedText,
-      readCustomStyleName,
-      isHelpCardOpen,
-      isHelpButtonVisible,
-      helpButtonOnClick,
-      helpCardLocalizedText,
-    )
+    if (!hintLocalizedText.isNullOrBlank() || isHelpButtonVisible || isHelpCardOpen) {
+      Help(
+        hintLocalizedText,
+        readCustomStyleName,
+        isHelpCardOpen,
+        isHelpButtonVisible,
+        helpButtonOnClick,
+        helpCardLocalizedText,
+      )
+    }
 
     // Required/Optional Text
     if (showRequiredOrOptionalText && !requiredOptionalText.isNullOrBlank()) {
@@ -225,28 +227,31 @@ internal fun Help(
   var isCardOpen by remember { mutableStateOf(isHelpCardInitiallyOpen) }
 
   Row(
-    modifier = Modifier.padding(vertical = dimensionResource(R.dimen.help_container_margin_top)),
+    modifier = Modifier.padding(top = dimensionResource(R.dimen.help_container_margin_top)),
     verticalAlignment = Alignment.CenterVertically,
   ) {
-    AndroidView(
-      factory = {
-        TextView(it).apply {
-          id = R.id.hint
-          movementMethod = LinkMovementMethod.getInstance()
-          applyCustomOrDefaultStyle(
-            context = it,
-            view = this,
-            customStyleName =
-              readCustomStyleName(
-                StyleUrl.SUBTITLE_TEXT_VIEW,
-              ),
-            defaultStyleResId =
-              getStyleResIdFromAttribute(it, R.attr.questionnaireSubtitleTextStyle),
-          )
-        }
-      },
-      update = { it.text = hintLocalizedText },
-    )
+    hintLocalizedText?.let {
+      AndroidView(
+        modifier = Modifier.weight(0.7f),
+        factory = {
+          TextView(it).apply {
+            id = R.id.hint
+            movementMethod = LinkMovementMethod.getInstance()
+            applyCustomOrDefaultStyle(
+              context = it,
+              view = this,
+              customStyleName =
+                readCustomStyleName(
+                  StyleUrl.SUBTITLE_TEXT_VIEW,
+                ),
+              defaultStyleResId =
+                getStyleResIdFromAttribute(it, R.attr.questionnaireSubtitleTextStyle),
+            )
+          }
+        },
+        update = { it.text = hintLocalizedText },
+      )
+    }
 
     if (isHelpButtonVisible) {
       IconButton(
@@ -258,6 +263,7 @@ internal fun Help(
           Modifier.padding(dimensionResource(R.dimen.help_icon_padding))
             .padding(start = dimensionResource(R.dimen.help_button_margin_start))
             .testTag(HELP_BUTTON_TAG)
+            .weight(0.3f)
             .size(
               width = dimensionResource(R.dimen.help_button_width),
               height = dimensionResource(R.dimen.help_button_height),