Merge pull request #2762 from dimagi/adjust-case-detail-display-text-…

…when-empty Adjust case detail display text column when empty
dimagi · Jun 24, 2024 · 2aaaff2 · 2aaaff2
2 parents 5da77f9 + ac51d60
commit 2aaaff2
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/app/src/org/commcare/views/EntityDetailView.java b/app/src/org/commcare/views/EntityDetailView.java
@@ -1,11 +1,8 @@
 package org.commcare.views;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.os.Build;
-import androidx.annotation.IdRes;
 import android.text.method.LinkMovementMethod;
 import android.view.Display;
 import android.view.GestureDetector;
@@ -23,6 +20,9 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.IdRes;
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.commcare.activities.CommCareGraphActivity;
 import org.commcare.cases.entity.Entity;
 import org.commcare.core.graph.model.GraphData;
@@ -202,9 +202,16 @@ public void setParams(Detail d, Entity e, int index, int detailNumber) {
         if (veryLong) {
             detailRow.setOrientation(LinearLayout.VERTICAL);
             spacer.setVisibility(View.GONE);
+            if (isLabelEmpty(labelText)) {
+                label.setVisibility(GONE);
+            }
             label.setLayoutParams(fill);
             valuePane.setLayoutParams(fill);
         } else {
+            if (isLabelEmpty(labelText)) {
+                origLabel.weight = 0;
+                origValue.weight = detailRow.getWeightSum();
+            }
             if (detailRow.getOrientation() != LinearLayout.HORIZONTAL) {
                 detailRow.setOrientation(LinearLayout.HORIZONTAL);
                 spacer.setVisibility(View.INVISIBLE);
@@ -214,6 +221,12 @@ public void setParams(Detail d, Entity e, int index, int detailNumber) {
         }
     }
 
+    // Empty case detail Display Texts are represented with an HTML non-breaking space (&nbsp). This was expanded
+    // to also check for blank spaces
+    private boolean isLabelEmpty(String text) {
+        return text.replaceAll("\\s|&nbsp;", "").equals("");
+    }
+
     private boolean setUpText(String textField) {
         data.setText((textField));
         updateCurrentView(TEXT, data);