Mark required questions using an asterisk (getodk#1828)

shobhitagarwal1612 · May 15, 2018 · 32d4177 · 32d4177
1 parent fd8cc80
commit 32d4177
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java
@@ -303,7 +303,7 @@ public void refreshView() {
                             // or if it is read-only and the label is not blank.
                             String answerDisplay = FormEntryPromptUtils.getAnswerText(fp, this);
                             formList.add(
-                                    new HierarchyElement(fp.getLongText(), answerDisplay, null,
+                                    new HierarchyElement(FormEntryPromptUtils.markQuestionIfIsRequired(label, fp.isRequired()), answerDisplay, null,
                                             Color.WHITE, QUESTION, fp.getIndex()));
                         }
                         break;

diff --git a/collect_app/src/main/java/org/odk/collect/android/utilities/FormEntryPromptUtils.java b/collect_app/src/main/java/org/odk/collect/android/utilities/FormEntryPromptUtils.java
@@ -74,4 +74,15 @@ public static String getAnswerText(FormEntryPrompt fep, Context context) {
 
         return fep.getAnswerText();
     }
+
+    public static String markQuestionIfIsRequired(String questionText, boolean isRequired) {
+        if (isRequired) {
+            if (questionText == null) {
+                questionText = "";
+            }
+            questionText = "<span style=\"color:#F44336\">*</span> " + questionText;
+        }
+
+        return questionText;
+    }
 }
diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/QuestionWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/QuestionWidget.java
@@ -49,6 +49,7 @@
 import org.odk.collect.android.utilities.DependencyProvider;
 import org.odk.collect.android.listeners.AudioPlayListener;
 import org.odk.collect.android.logic.FormController;
+import org.odk.collect.android.utilities.FormEntryPromptUtils;
 import org.odk.collect.android.utilities.TextUtils;
 import org.odk.collect.android.utilities.ViewIds;
 import org.odk.collect.android.views.MediaLayout;
@@ -142,13 +143,14 @@ private MediaLayout createQuestionMediaLayout(FormEntryPrompt prompt) {
         questionText.setTypeface(null, Typeface.BOLD);
         questionText.setTextColor(ContextCompat.getColor(getContext(), R.color.primaryTextColor));
         questionText.setPadding(0, 0, 0, 7);
-        questionText.setText(promptText == null ? "" : TextUtils.textToHtml(promptText));
+        questionText.setText(TextUtils.textToHtml(FormEntryPromptUtils.markQuestionIfIsRequired(promptText, prompt.isRequired())));
         questionText.setMovementMethod(LinkMovementMethod.getInstance());
 
         // Wrap to the size of the parent view
         questionText.setHorizontallyScrolling(false);
 
-        if (promptText == null || promptText.length() == 0) {
+        if ((promptText == null || promptText.isEmpty())
+                && !(prompt.isRequired() && (prompt.getHelpText() == null || prompt.getHelpText().isEmpty()))) {
             questionText.setVisibility(GONE);
         }
 
@@ -324,7 +326,11 @@ private TextView createHelpText(FormEntryPrompt prompt) {
             // wrap to the widget of view
             helpText.setHorizontallyScrolling(false);
             helpText.setTypeface(null, Typeface.ITALIC);
-            helpText.setText(TextUtils.textToHtml(s));
+            if (prompt.getLongText() == null || prompt.getLongText().isEmpty()) {
+                helpText.setText(TextUtils.textToHtml(FormEntryPromptUtils.markQuestionIfIsRequired(s, prompt.isRequired())));
+            } else {
+                helpText.setText(TextUtils.textToHtml(s));
+            }
             helpText.setTextColor(ContextCompat.getColor(getContext(), R.color.primaryTextColor));
             helpText.setMovementMethod(LinkMovementMethod.getInstance());
             return helpText;