diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 45cf85c..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/java/kz/istt/locust/LocustDelActivity.java b/app/src/main/java/kz/istt/locust/LocustDelActivity.java index bd135ad..05c928f 100644 --- a/app/src/main/java/kz/istt/locust/LocustDelActivity.java +++ b/app/src/main/java/kz/istt/locust/LocustDelActivity.java @@ -1058,7 +1058,7 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe //Type of biological impact being assessed (I build a table of checkboxes) edtBiologicalImpact = findViewById(R.id.edtBiologicalImpact); guiTable.add(edtBiologicalImpact, "efficacy_impact"); - OnCheckedChangeListener occlBiologicalImpact = new OnCheckedChangeListener() + CompoundButton.OnCheckedChangeListener occlBiologicalImpact = new CompoundButton.OnCheckedChangeListener() { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -1084,14 +1084,8 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe edtBiologicalImpact.addTextChangedListener(new TextWatcher() { - public void afterTextChanged(Editable s) - { - } - - public void beforeTextChanged(CharSequence s, int start, int count, int after) - { - } - + public void afterTextChanged(Editable s){} + public void beforeTextChanged(CharSequence s, int start, int count, int after){} public void onTextChanged(CharSequence s, int start, int before, int count) { String str = LocustDelActivity.this.edtBiologicalImpact.getText().toString(); diff --git a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java index 2baec49..0860601 100644 --- a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java +++ b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java @@ -1309,7 +1309,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi //Type of biological impact being assessed (I build a table of checkboxes) edtBiologicalImpact = findViewById(R.id.edtBiologicalImpact); - guiTableHealth.add(edtBiologicalImpact, "efficacy_impact"); + guiTableDel.add(edtBiologicalImpact, "efficacy_impact"); CompoundButton.OnCheckedChangeListener occlBiologicalImpact = new CompoundButton.OnCheckedChangeListener() { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) @@ -1336,14 +1336,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi edtBiologicalImpact.addTextChangedListener(new TextWatcher() { - public void afterTextChanged(Editable s) - { - } - - public void beforeTextChanged(CharSequence s, int start, int count, int after) - { - } - + public void afterTextChanged(Editable s){} + public void beforeTextChanged(CharSequence s, int start, int count, int after){} public void onTextChanged(CharSequence s, int start, int before, int count) { String str = LocustHealthActivity.this.edtBiologicalImpact.getText().toString(); @@ -1512,7 +1506,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi //Type of biological impact being assessed (I build a table of checkboxes) edtEffTypeImpact = findViewById(R.id.edtEffTypeImpact); - guiTableDel.add(edtEffTypeImpact, "efficacy_impact_type"); + guiTableHealth.add(edtEffTypeImpact, "efficacy_impact_type"); CompoundButton.OnCheckedChangeListener occlEffTypeImpact = new CompoundButton.OnCheckedChangeListener() { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) diff --git a/app/src/main/res/layout/activity_locust_del.xml b/app/src/main/res/layout/activity_locust_del.xml index 598d126..a9c7e64 100644 --- a/app/src/main/res/layout/activity_locust_del.xml +++ b/app/src/main/res/layout/activity_locust_del.xml @@ -2091,10 +2091,8 @@ android:id="@+id/edtClothing" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_column="1" - android:layout_row="2" - android:hint="" - android:visibility="invisible" /> + android:inputType="text" + android:visibility="gone" />