diff --git a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/BirdsConverter.java b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/BirdsConverter.java
index e4e1eedd..eedd9d30 100644
--- a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/BirdsConverter.java
+++ b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/BirdsConverter.java
@@ -47,6 +47,7 @@ public BirdsConverter(Context context) {
addSingle(R.string.tag_breeding_success, "nestingSuccess");
add(R.string.tag_land_uses_300m, "landuse300mRadius");
add(R.string.tag_remarks_type, "speciesNotes");
+ addMulti(R.string.tag_threats, "threats");
}
}
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/CbmConverter.java b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/CbmConverter.java
index 11528f1b..b273f152 100644
--- a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/CbmConverter.java
+++ b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/CbmConverter.java
@@ -22,6 +22,7 @@ public CbmConverter(Context context) {
add(R.string.tag_count_subject, "count");
add(R.string.tag_location, "location");
add(R.string.tag_zone, "zone");
+ addMulti(R.string.tag_threats, "threats");
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/CiconiaConverter.java b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/CiconiaConverter.java
index 7cf3fd3c..97aa2d2c 100644
--- a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/CiconiaConverter.java
+++ b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/CiconiaConverter.java
@@ -33,6 +33,7 @@ public CiconiaConverter(Context context) {
add(R.string.tag_died_from_other_causes, "diedOtherReasons");
add(R.string.tag_cause, "reason");
add(R.string.tag_ciconia_remarks_type, "speciesNotes");
+ addMulti(R.string.tag_threats, "threats");
}
}
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/HerpConverter.java b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/HerpConverter.java
index 32b768f3..21c1913f 100644
--- a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/HerpConverter.java
+++ b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/HerpConverter.java
@@ -17,7 +17,7 @@ public HerpConverter(Context context) {
addSingle(R.string.tag_sex, "sex");
addSingle(R.string.tag_age, "age");
addSingle(R.string.tag_habitat, "habitat");
- addMulti(R.string.tag_threats_other, "threatsHerps");
+ addMulti(R.string.tag_threats_other, "findings");
add(R.string.tag_count, "count");
add(R.string.tag_marking, "marking");
add(R.string.tag_distance_from_axis, "axisDistance");
@@ -33,6 +33,7 @@ public HerpConverter(Context context) {
add(R.string.tag_sq_caud, "sqCaud");
add(R.string.tag_sq_dors, "sqDors");
add(R.string.tag_remarks_type, "speciesNotes");
+ addMulti(R.string.tag_threats, "threats");
}
}
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/HerptileConverter.java b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/HerptileConverter.java
index 95b4fdcc..788727f1 100644
--- a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/HerptileConverter.java
+++ b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/HerptileConverter.java
@@ -18,6 +18,7 @@ public HerptileConverter(Context context) {
addSingle(R.string.tag_age, "age");
addSingle(R.string.tag_habitat, "habitat");
addMulti(R.string.tag_threats_other, "threatsHerptiles");
+ addMulti(R.string.tag_findings, "findings");
add(R.string.tag_count, "count");
add(R.string.tag_marking, "marking");
add(R.string.tag_distance_from_axis, "axisDistance");
@@ -34,6 +35,7 @@ public HerptileConverter(Context context) {
add(R.string.tag_sq_dors, "sqDors");
add(R.string.tag_remarks_type, "speciesNotes");
addBool(R.string.tag_confidential, "confidential");
+ addMulti(R.string.tag_threats, "threats");
}
}
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/InvertebratesConverter.java b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/InvertebratesConverter.java
index 617a1ccd..0ed33ef8 100644
--- a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/InvertebratesConverter.java
+++ b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/InvertebratesConverter.java
@@ -14,10 +14,12 @@ public InvertebratesConverter(Context context) {
addSingle(R.string.tag_age, "age");
addSingle(R.string.tag_habitat, "habitat");
addMulti(R.string.tag_threats_other, "threatsInvertebrates");
+ addMulti(R.string.tag_findings, "findings");
add(R.string.tag_count, "count");
add(R.string.tag_marking, "marking");
add(R.string.tag_remarks_type, "speciesNotes");
addBool(R.string.tag_confidential, "confidential");
+ addMulti(R.string.tag_threats, "threats");
}
}
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/MammalConverter.java b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/MammalConverter.java
index 1219721b..a8160be5 100644
--- a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/MammalConverter.java
+++ b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/MammalConverter.java
@@ -18,6 +18,7 @@ public MammalConverter(Context context) {
addSingle(R.string.tag_age, "age");
addSingle(R.string.tag_habitat, "habitat");
addMulti(R.string.tag_threats_other, "threatsMammals");
+ addMulti(R.string.tag_findings, "findings");
add(R.string.tag_count, "count");
add(R.string.tag_marking, "marking");
add(R.string.tag_distance_from_axis, "axisDistance");
@@ -30,6 +31,7 @@ public MammalConverter(Context context) {
add(R.string.tag_t_air, "tempAir");
add(R.string.tag_remarks_type, "speciesNotes");
addBool(R.string.tag_confidential, "confidential");
+ addMulti(R.string.tag_threats, "threats");
}
}
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/PlantsConverter.java b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/PlantsConverter.java
index 8dd8d59c..846eda82 100644
--- a/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/PlantsConverter.java
+++ b/app/src/main/java/org/bspb/smartbirds/pro/forms/convert/PlantsConverter.java
@@ -24,6 +24,7 @@ public PlantsConverter(Context context) {
add(R.string.tag_density, "density");
add(R.string.tag_cover, "cover");
addMulti(R.string.tag_threats_other, "threatsPlants");
+ addMulti(R.string.tag_threats, "threats");
add(R.string.tag_remarks_type, "speciesNotes");
addBool(R.string.tag_confidential, "confidential");
}
diff --git a/app/src/main/res/layout/fragment_monitoring_form_common.xml b/app/src/main/res/layout/fragment_monitoring_form_common.xml
index 94307d8a..7d447bdd 100644
--- a/app/src/main/res/layout/fragment_monitoring_form_common.xml
+++ b/app/src/main/res/layout/fragment_monitoring_form_common.xml
@@ -170,15 +170,6 @@
-
-
-
-
@@ -12,6 +13,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_monitoring_form_new_ciconia_entry.xml b/app/src/main/res/layout/fragment_monitoring_form_new_ciconia_entry.xml
index 11c63fe0..4384665b 100644
--- a/app/src/main/res/layout/fragment_monitoring_form_new_ciconia_entry.xml
+++ b/app/src/main/res/layout/fragment_monitoring_form_new_ciconia_entry.xml
@@ -19,8 +19,7 @@
+ android:text="@string/monitoring_ciconia_sep_1" />
@@ -73,8 +72,7 @@
+ android:text="@string/monitoring_ciconia_sep_2" />
@@ -102,8 +100,7 @@
+ android:text="@string/monitoring_ciconia_sep_3" />
@@ -115,8 +112,7 @@
+ android:text="@string/monitoring_ciconia_sep_4" />
@@ -127,8 +123,7 @@
+ android:text="@string/monitoring_ciconia_sep_5" />
@@ -139,8 +134,7 @@
+ android:text="@string/monitoring_ciconia_sep_6" />
@@ -166,10 +160,18 @@
+
+
+
diff --git a/app/src/main/res/layout/fragment_monitoring_form_new_herp_required_entry.xml b/app/src/main/res/layout/fragment_monitoring_form_new_herp_required_entry.xml
index 410a9eb2..800bac09 100644
--- a/app/src/main/res/layout/fragment_monitoring_form_new_herp_required_entry.xml
+++ b/app/src/main/res/layout/fragment_monitoring_form_new_herp_required_entry.xml
@@ -55,7 +55,7 @@
@@ -85,6 +85,17 @@
+
+
+
+
+
@@ -63,8 +63,8 @@
+ android:tag="@string/tag_findings"
+ app:entries="form_herptiles_findings" />
@@ -93,6 +93,17 @@
+
+
+
+
+
+ android:tag="@string/tag_findings"
+ app:entries="form_invertebrates_findings" />
@@ -87,6 +87,17 @@
+
+
+
+
+
+ android:tag="@string/tag_findings"
+ app:entries="form_mammals_findings" />
@@ -93,6 +93,17 @@
+
+
+
+
+
+ android:text="@string/monitoring_plants_elevation_units"
+ android:textColor="?android:textColorHint" />
@@ -107,6 +107,17 @@
app:entries="form_plants_threats" />
+
+
+
+
+
Reason
Habitat
Threats observations
+ Findings
Distance from axis
Mass (g)
Temp substrate
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a6dc1ac..0aba9054 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -126,7 +126,7 @@ Do you really want to cancel the monitoring?"
"Sex"
"Age"
"Habitat"
-"Threats, other"
+"Findings"
"Count"
"Marking"
"Distance from axis"