igor/org.ccalm.asdc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop

Browse Source
This commit is contained in:
Igor I
2025-09-04 10:31:32 +05:00
parent e916f1012b b805095d82
commit c935e299bc
4 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/vcs.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="" vcs="svn" /> <mapping directory="" vcs="Git" />
</component> </component>
</project> </project>

12
app/src/main/java/kz/istt/locust/LocustDelActivity.java
View File

@ -1058,7 +1058,7 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
//Type of biological impact being assessed (I build a table of checkboxes) //Type of biological impact being assessed (I build a table of checkboxes)
edtBiologicalImpact = findViewById(R.id.edtBiologicalImpact); edtBiologicalImpact = findViewById(R.id.edtBiologicalImpact);
guiTable.add(edtBiologicalImpact, "efficacy_impact"); guiTable.add(edtBiologicalImpact, "efficacy_impact");
OnCheckedChangeListener occlBiologicalImpact = new OnCheckedChangeListener() CompoundButton.OnCheckedChangeListener occlBiologicalImpact = new CompoundButton.OnCheckedChangeListener()
{ {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
{ {
@ -1084,14 +1084,8 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
edtBiologicalImpact.addTextChangedListener(new TextWatcher() edtBiologicalImpact.addTextChangedListener(new TextWatcher()
{ {
public void afterTextChanged(Editable s) public void afterTextChanged(Editable s){}
{ public void beforeTextChanged(CharSequence s, int start, int count, int after){}
}
public void beforeTextChanged(CharSequence s, int start, int count, int after)
{
}
public void onTextChanged(CharSequence s, int start, int before, int count) public void onTextChanged(CharSequence s, int start, int before, int count)
{ {
String str = LocustDelActivity.this.edtBiologicalImpact.getText().toString(); String str = LocustDelActivity.this.edtBiologicalImpact.getText().toString();

14
app/src/main/java/kz/istt/locust/LocustHealthActivity.java
View File

@ -1309,7 +1309,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
//Type of biological impact being assessed (I build a table of checkboxes) //Type of biological impact being assessed (I build a table of checkboxes)
edtBiologicalImpact = findViewById(R.id.edtBiologicalImpact); edtBiologicalImpact = findViewById(R.id.edtBiologicalImpact);
guiTableHealth.add(edtBiologicalImpact, "efficacy_impact"); guiTableDel.add(edtBiologicalImpact, "efficacy_impact");
CompoundButton.OnCheckedChangeListener occlBiologicalImpact = new CompoundButton.OnCheckedChangeListener() CompoundButton.OnCheckedChangeListener occlBiologicalImpact = new CompoundButton.OnCheckedChangeListener()
{ {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
@ -1336,14 +1336,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
edtBiologicalImpact.addTextChangedListener(new TextWatcher() edtBiologicalImpact.addTextChangedListener(new TextWatcher()
{ {
public void afterTextChanged(Editable s) public void afterTextChanged(Editable s){}
{ public void beforeTextChanged(CharSequence s, int start, int count, int after){}
}
public void beforeTextChanged(CharSequence s, int start, int count, int after)
{
}
public void onTextChanged(CharSequence s, int start, int before, int count) public void onTextChanged(CharSequence s, int start, int before, int count)
{ {
String str = LocustHealthActivity.this.edtBiologicalImpact.getText().toString(); 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) //Type of biological impact being assessed (I build a table of checkboxes)
edtEffTypeImpact = findViewById(R.id.edtEffTypeImpact); edtEffTypeImpact = findViewById(R.id.edtEffTypeImpact);
guiTableDel.add(edtEffTypeImpact, "efficacy_impact_type"); guiTableHealth.add(edtEffTypeImpact, "efficacy_impact_type");
CompoundButton.OnCheckedChangeListener occlEffTypeImpact = new CompoundButton.OnCheckedChangeListener() CompoundButton.OnCheckedChangeListener occlEffTypeImpact = new CompoundButton.OnCheckedChangeListener()
{ {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)

6
app/src/main/res/layout/activity_locust_del.xml
View File

@ -2091,10 +2091,8 @@
android:id="@+id/edtClothing" android:id="@+id/edtClothing"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_column="1" android:inputType="text"
android:layout_row="2" android:visibility="gone" />
android:hint=""
android:visibility="invisible" />
</LinearLayout> </LinearLayout>
<GridLayout <GridLayout