SORMAS-Foundation#3458 - set clear to unknown button for symptoms on mobile app (SORMAS-Foundation#3847)

* SORMAS-Foundation#3458 - set clear to unknown button for symptoms on mobile app

* SORMAS-Foundation#3458 - fix clear buttons layout on symptoms edit fragment

Co-authored-by: barnabartha <[email protected]>

Author: BarnaBartha

sormas-app/app/src/main/java/de/symeda/sormas/app/symptoms/SymptomsEditFragment.java

@@ -15,15 +15,12 @@
 
 package de.symeda.sormas.app.symptoms;
 
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
+import android.content.res.Resources;
+import android.view.View;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import android.content.res.Resources;
-import android.view.View;
-
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.person.ApproximateAgeType;
 import de.symeda.sormas.api.symptoms.CongenitalHeartDiseaseType;
@@ -59,6 +56,9 @@
 import de.symeda.sormas.app.util.Bundler;
 import de.symeda.sormas.app.util.DataUtils;
 
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
 public class SymptomsEditFragment extends BaseEditFragment<FragmentSymptomsEditLayoutBinding, Symptoms, AbstractDomainObject> {
 
 	private Symptoms record;
@@ -73,6 +73,7 @@ public class SymptomsEditFragment extends BaseEditFragment<FragmentSymptomsEditL
 
 	private IEntryItemOnClickListener clearAllCallback;
 	private IEntryItemOnClickListener setClearedToNoCallback;
+	private IEntryItemOnClickListener setClearedToUnknownCallback;
 
 	private List<ControlSwitchField> symptomFields;
 
@@ -156,6 +157,7 @@ public void onLayoutBinding(final FragmentSymptomsEditLayoutBinding contentBindi
 		contentBinding.setSymptomStateClass(SymptomState.class);
 		contentBinding.setClearAllCallback(clearAllCallback);
 		contentBinding.setSetClearedToNoCallback(setClearedToNoCallback);
+		contentBinding.setSetClearedToUnknownCallback(setClearedToUnknownCallback);
 
 		SymptomsValidator.initializeSymptomsValidation(contentBinding, ado);
 	}
@@ -319,6 +321,18 @@ public void onClick(View v, Object item) {
 				}
 			}
 		};
+
+		setClearedToUnknownCallback = new IEntryItemOnClickListener() {
+
+			@Override
+			public void onClick(View v, Object item) {
+				for (ControlSwitchField symptomField : symptomFields) {
+					if (symptomField.getVisibility() == VISIBLE && symptomField.getValue() == null) {
+						symptomField.setValue(SymptomState.UNKNOWN);
+					}
+				}
+			}
+		};
 	}
 
 	private List<Item> getTemperatures(boolean withNull) {

sormas-app/app/src/main/res/layout/fragment_symptoms_edit_layout.xml

@@ -34,6 +34,7 @@
         <variable name="symptomStateClass" type="Class"/>
         <variable name="clearAllCallback" type="de.symeda.sormas.app.core.IEntryItemOnClickListener"/>
         <variable name="setClearedToNoCallback" type="de.symeda.sormas.app.core.IEntryItemOnClickListener"/>
+        <variable name="setClearedToUnknownCallback" type="de.symeda.sormas.app.core.IEntryItemOnClickListener"/>
         <variable name="symptomsContext" type="de.symeda.sormas.api.symptoms.SymptomsContext" />
     </data>
 
@@ -87,6 +88,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
+                android:weightSum="2"
                 android:orientation="horizontal">
 
                 <de.symeda.sormas.app.component.controls.ControlButton
@@ -103,11 +105,29 @@
                     android:id="@+id/btn_cleared_to_no"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/control_spacing"
                     android:layout_weight="1"
+                    android:layout_marginLeft="@dimen/control_spacing"
                     android:onClick="@{(view) -> setClearedToNoCallback.onClick(view, data)}"
                     android:text="@string/action_set_cleared_to_no"
                     app:buttonType="@{ControlButtonType.LINE_SECONDARY}"
+                    app:slim="true" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
+                android:orientation="horizontal">
+
+                <de.symeda.sormas.app.component.controls.ControlButton
+                    android:id="@+id/btn_cleared_to_unknown"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:onClick="@{(view) -> setClearedToUnknownCallback.onClick(view, data)}"
+                    android:text="@string/action_set_cleared_to_unknown"
+                    app:buttonType="@{ControlButtonType.LINE_SECONDARY}"
                     app:slim="true"/>
 
             </LinearLayout>

sormas-app/app/src/main/res/values/strings.xml

@@ -105,6 +105,7 @@
     <string name="action_select">Select</string>
     <string name="action_send">Send</string>
     <string name="action_set_cleared_to_no">Set Cleared to No</string>
+    <string name="action_set_cleared_to_unknown">Set Cleared to Unknown</string>
     <string name="action_show_classification_rules">View classification rules</string>
     <string name="action_submit_report">Submit Weekly Report</string>
     <string name="action_sync">Sync</string>