Multi select eff impect (ubuntu)
This commit is contained in:
1
.idea/misc.xml
generated
1
.idea/misc.xml
generated
@ -28,6 +28,7 @@
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="NullableNotNullManager">
|
||||
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
|
||||
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
|
||||
|
||||
@ -5,7 +5,7 @@ android {
|
||||
config {
|
||||
keyAlias 'ASDC'
|
||||
keyPassword 'firstg@h0km'
|
||||
storeFile file('O:/projects/Workspace_Android/Keystore/locustkeystore')
|
||||
storeFile file('/mnt/O_DRIVE/projects/Workspace_Android/Keystore/locustkeystore')
|
||||
storePassword 'locustg@h0km'
|
||||
}
|
||||
}
|
||||
|
||||
@ -167,7 +167,7 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
|
||||
|
||||
public CheckBox cbEffectiveness = null; // Галочка чтоб сделать поля не обязательными
|
||||
|
||||
public View spiTypeImpact = null; // Тип оцениваемого биологического воздействия
|
||||
//public View spiTypeImpact = null; // Тип оцениваемого биологического воздействия
|
||||
public GridLayout glBiologicalImpact = null; // Тип оцениваемого биологического воздействия (grid)
|
||||
public EditText edtBiologicalImpact = null; // Тип оцениваемого биологического воздействия (список значений)
|
||||
|
||||
@ -1055,7 +1055,6 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
|
||||
}
|
||||
dboh.close();*/
|
||||
|
||||
|
||||
//Type of biological impact being assessed (I build a table of checkboxes)
|
||||
edtBiologicalImpact = findViewById(R.id.edtBiologicalImpact);
|
||||
guiTable.add(edtBiologicalImpact, "efficacy_impact");
|
||||
@ -1083,6 +1082,32 @@ 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 onTextChanged(CharSequence s, int start, int before, int count)
|
||||
{
|
||||
String str = LocustDelActivity.this.edtBiologicalImpact.getText().toString();
|
||||
for (int i = 0; i < glBiologicalImpact.getChildCount(); i++) {
|
||||
View child = glBiologicalImpact.getChildAt(i);
|
||||
if (child instanceof CheckBox) {
|
||||
CheckBox cb = (CheckBox) child;
|
||||
String val = cb.getTag().toString();
|
||||
if(str.contains(val) && !cb.isChecked()) {
|
||||
cb.setChecked(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
glBiologicalImpact = findViewById(R.id.glBiologicalImpact);
|
||||
dboh = new DbOpenHelper(this);
|
||||
rdb = null;
|
||||
@ -1126,31 +1151,9 @@ public class LocustDelActivity extends FragmentActivity implements LocationListe
|
||||
}
|
||||
dboh.close();
|
||||
|
||||
edtBiologicalImpact.addTextChangedListener(new TextWatcher()
|
||||
{
|
||||
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();
|
||||
for (int i = 0; i < glBiologicalImpact.getChildCount(); i++) {
|
||||
View child = glBiologicalImpact.getChildAt(i);
|
||||
if (child instanceof CheckBox) {
|
||||
CheckBox cb = (CheckBox) child;
|
||||
String val = cb.getTag().toString();
|
||||
if(str.contains(val) && !cb.isChecked()) {
|
||||
cb.setChecked(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
edtEffMortality = (EditText) findViewById(R.id.edtEffMortality); // смертность саранчи(%)
|
||||
guiTable.add(edtEffMortality, "efficacy_mortality");
|
||||
|
||||
@ -31,6 +31,7 @@ import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.CompoundButton;
|
||||
import android.widget.EditText;
|
||||
import android.widget.GridLayout;
|
||||
import android.widget.LinearLayout;
|
||||
@ -158,18 +159,20 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
|
||||
public EditText edtCalibrDropletCoating = null; //H Ширина дорожки с хорошим покрытием капель (м)
|
||||
public EditText edtCalibrPassesInterval = null; //H Рекомендуемый интервал между проходами (м)
|
||||
|
||||
public View spiEffControl = null; // Контроль эфективности
|
||||
public View spiEffTypeImpact = null; // Тип оцениваемого биологического воздействия
|
||||
public GridLayout glEffTypeImpact = null; // Тип оцениваемого биологического воздействия (grid)
|
||||
public EditText edtEffTypeImpact = null; // Тип оцениваемого биологического воздействия (список значений)
|
||||
public View spiEffControl = null; // Контроль эфективности (Контроль эффективности проведен (бригада по обработке)?)
|
||||
//public View spiEffTypeImpact = null; // Тип оцениваемого биологического воздействия (теперь множественный выбор, не используется)
|
||||
public GridLayout glBiologicalImpact = null; // Тип оцениваемого биологического воздействия (grid)
|
||||
public EditText edtBiologicalImpact = null; // Тип оцениваемого биологического воздействия (список значений)
|
||||
|
||||
//glBiologicalImpact
|
||||
public EditText edtEffMortality = null; // смертность саранчи(%)
|
||||
public EditText edtEffPassedTime = null; // Прошло времени после обработки в часах
|
||||
public View spiEffMethod = null; // метод подсчета смертности
|
||||
|
||||
public View spiEffControl2 = null; //H Проведен ли контроль эффективности (бригада мониторинга)?
|
||||
public View spiEffTypeImpact2 = null; //H Тип оцениваемого биологического воздействия
|
||||
//public View spiEffTypeImpact2 = null; //H Тип оцениваемого биологического воздействия
|
||||
public GridLayout glEffTypeImpact = null; //H Тип оцениваемого биологического воздействия(grid)
|
||||
public EditText edtEffTypeImpact = null; //H Тип оцениваемого биологического воздействия (список значений)
|
||||
|
||||
public EditText edtEffMortality2 = null; //H Наблюдаемая эффективность обработки (%)
|
||||
public EditText edtEffPassedTime2 = null; //H Прошло времени после обработки
|
||||
public View spiEffMethod2 = null; //H Метод оценки эффективности обработки (выбор: подсчет квадратов; подсчет по разрезам; подсчет кулиг личинок; другое)
|
||||
@ -1304,10 +1307,60 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
|
||||
}
|
||||
dboh.close();*/
|
||||
|
||||
//public GridLayout glEffTypeImpact = null; // Тип оцениваемого биологического воздействия (grid)
|
||||
//public EditText edtEffTypeImpact = null; // Тип оцениваемого биологического воздействия (список значений)
|
||||
//Type of biological impact being assessed (I build a table of checkboxes)
|
||||
edtBiologicalImpact = findViewById(R.id.edtBiologicalImpact);
|
||||
guiTableHealth.add(edtBiologicalImpact, "efficacy_impact");
|
||||
CompoundButton.OnCheckedChangeListener occlBiologicalImpact = new CompoundButton.OnCheckedChangeListener()
|
||||
{
|
||||
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
|
||||
{
|
||||
StringBuilder val = new StringBuilder();
|
||||
// loop through all elements inside the GridLayout
|
||||
for (int i = 0; i < glBiologicalImpact.getChildCount(); i++) {
|
||||
View child = glBiologicalImpact.getChildAt(i);
|
||||
if (child instanceof CheckBox) {
|
||||
CheckBox cb = (CheckBox) child;
|
||||
if (cb.isChecked()) {
|
||||
val.append(cb.getTag().toString()).append(",");
|
||||
}
|
||||
}
|
||||
}
|
||||
// remove the last comma if there is one
|
||||
if (val.length() > 0 && val.charAt(val.length() - 1) == ',') {
|
||||
val.deleteCharAt(val.length() - 1);
|
||||
}
|
||||
// save in editText
|
||||
LocustHealthActivity.this.edtBiologicalImpact.setText(val.toString());
|
||||
}
|
||||
};
|
||||
|
||||
glEffTypeImpact = findViewById(R.id.glEffTypeImpact);
|
||||
edtBiologicalImpact.addTextChangedListener(new TextWatcher()
|
||||
{
|
||||
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();
|
||||
for (int i = 0; i < glBiologicalImpact.getChildCount(); i++) {
|
||||
View child = glBiologicalImpact.getChildAt(i);
|
||||
if (child instanceof CheckBox) {
|
||||
CheckBox cb = (CheckBox) child;
|
||||
String val = cb.getTag().toString();
|
||||
if(str.contains(val) && !cb.isChecked()) {
|
||||
cb.setChecked(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
glBiologicalImpact = findViewById(R.id.glBiologicalImpact);
|
||||
dboh = new DbOpenHelper(this);
|
||||
rdb = null;
|
||||
cursor = null;
|
||||
@ -1319,24 +1372,22 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
|
||||
{
|
||||
int row = 0;
|
||||
int col = 0;
|
||||
int colCount = glEffTypeImpact.getColumnCount(); // например 2
|
||||
int colCount = glBiologicalImpact.getColumnCount(); // например 2
|
||||
do
|
||||
{
|
||||
String name = cursor.getString(cursor.getColumnIndexOrThrow("name"));
|
||||
String id = cursor.getString(cursor.getColumnIndexOrThrow("id"));
|
||||
|
||||
CheckBox cb = new CheckBox(this);
|
||||
cb.setEnabled(false);
|
||||
cb.setText(name);
|
||||
cb.setTag(id);
|
||||
cb.setEnabled(false);
|
||||
cb.setFocusable(false);
|
||||
cb.setClickable(false);
|
||||
cb.setLayoutParams(new GridLayout.LayoutParams(
|
||||
GridLayout.spec(row, 1f), // row index
|
||||
GridLayout.spec(col, 1f) // column index
|
||||
));
|
||||
//cb.setOnCheckedChangeListener(occlBiologicalImpact);
|
||||
glEffTypeImpact.addView(cb);
|
||||
cb.setOnCheckedChangeListener(occlBiologicalImpact);
|
||||
glBiologicalImpact.addView(cb);
|
||||
|
||||
col++;
|
||||
if (col >= colCount) {
|
||||
@ -1353,9 +1404,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
|
||||
}
|
||||
dboh.close();
|
||||
|
||||
|
||||
|
||||
|
||||
//+++++++++++++++++++++++++++++++
|
||||
|
||||
|
||||
|
||||
@ -1425,7 +1474,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
|
||||
llEffPassedTime2.setVisibility(View.VISIBLE);
|
||||
llEffMethod2.setVisibility(View.VISIBLE);
|
||||
}else{
|
||||
((selectDB)spiEffTypeImpact2).setValue(null);
|
||||
//((selectDB)spiEffTypeImpact2).setValue(null);
|
||||
edtEffMortality2.setText("");
|
||||
edtEffPassedTime2.setText("");
|
||||
((selectDB)spiEffMethod2).setValue(null);
|
||||
@ -1437,7 +1486,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
|
||||
}
|
||||
});
|
||||
//H Тип оцениваемого биологического воздействия
|
||||
spiEffTypeImpact2 = findViewById(R.id.spiEffTypeImpact2);
|
||||
/*spiEffTypeImpact2 = findViewById(R.id.spiEffTypeImpact2);
|
||||
guiTableHealth.add(spiEffTypeImpact2, "efficacy_impact_type_id");
|
||||
((selectDB)spiEffTypeImpact2).addField("", "");
|
||||
dboh = new DbOpenHelper(this);
|
||||
@ -1459,8 +1508,103 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
|
||||
if(cursor!=null){ cursor.close(); }
|
||||
if(rdb!=null){ rdb.close(); }
|
||||
}
|
||||
dboh.close();*/
|
||||
|
||||
//Type of biological impact being assessed (I build a table of checkboxes)
|
||||
edtEffTypeImpact = findViewById(R.id.edtEffTypeImpact);
|
||||
guiTableDel.add(edtEffTypeImpact, "efficacy_impact_type");
|
||||
CompoundButton.OnCheckedChangeListener occlEffTypeImpact = new CompoundButton.OnCheckedChangeListener()
|
||||
{
|
||||
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
|
||||
{
|
||||
StringBuilder val = new StringBuilder();
|
||||
// loop through all elements inside the GridLayout
|
||||
for (int i = 0; i < glEffTypeImpact.getChildCount(); i++) {
|
||||
View child = glEffTypeImpact.getChildAt(i);
|
||||
if (child instanceof CheckBox) {
|
||||
CheckBox cb = (CheckBox) child;
|
||||
if (cb.isChecked()) {
|
||||
val.append(cb.getTag().toString()).append(",");
|
||||
}
|
||||
}
|
||||
}
|
||||
// remove the last comma if there is one
|
||||
if (val.length() > 0 && val.charAt(val.length() - 1) == ',') {
|
||||
val.deleteCharAt(val.length() - 1);
|
||||
}
|
||||
// save in editText
|
||||
LocustHealthActivity.this.edtEffTypeImpact.setText(val.toString());
|
||||
}
|
||||
};
|
||||
|
||||
edtEffTypeImpact.addTextChangedListener(new TextWatcher()
|
||||
{
|
||||
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.edtEffTypeImpact.getText().toString();
|
||||
for (int i = 0; i < glEffTypeImpact.getChildCount(); i++) {
|
||||
View child = glEffTypeImpact.getChildAt(i);
|
||||
if (child instanceof CheckBox) {
|
||||
CheckBox cb = (CheckBox) child;
|
||||
String val = cb.getTag().toString();
|
||||
if(str.contains(val) && !cb.isChecked()) {
|
||||
cb.setChecked(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
glEffTypeImpact = findViewById(R.id.glEffTypeImpact);
|
||||
dboh = new DbOpenHelper(this);
|
||||
rdb = null;
|
||||
cursor = null;
|
||||
try {
|
||||
rdb = dboh.getReadableDatabase();
|
||||
cursor = rdb.rawQuery("select d.id, COALESCE((SELECT translation FROM _translations t JOIN _languages l ON t.language_id=l.id WHERE t.del = 0 AND identifier = d.name AND l.short_name='"
|
||||
+ Tools.getLang() + "' LIMIT 1),d.name) name from list_impact d where d.del=0 order by d.sort,d.name", null);
|
||||
if (cursor.moveToFirst())
|
||||
{
|
||||
int row = 0;
|
||||
int col = 0;
|
||||
int colCount = glEffTypeImpact.getColumnCount(); // например 2
|
||||
do
|
||||
{
|
||||
String name = cursor.getString(cursor.getColumnIndexOrThrow("name"));
|
||||
String id = cursor.getString(cursor.getColumnIndexOrThrow("id"));
|
||||
|
||||
CheckBox cb = new CheckBox(this);
|
||||
cb.setText(name);
|
||||
cb.setTag(id);
|
||||
cb.setLayoutParams(new GridLayout.LayoutParams(
|
||||
GridLayout.spec(row, 1f), // row index
|
||||
GridLayout.spec(col, 1f) // column index
|
||||
));
|
||||
cb.setOnCheckedChangeListener(occlEffTypeImpact);
|
||||
glEffTypeImpact.addView(cb);
|
||||
|
||||
col++;
|
||||
if (col >= colCount) {
|
||||
col = 0;
|
||||
row++;
|
||||
}
|
||||
} while (cursor.moveToNext());
|
||||
}
|
||||
}catch(Exception e){
|
||||
e.printStackTrace();
|
||||
}finally{
|
||||
if(cursor!=null){ cursor.close(); }
|
||||
if(rdb!=null){ rdb.close(); }
|
||||
}
|
||||
dboh.close();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//H Наблюдаемая эффективность обработки (%)
|
||||
edtEffMortality2 = (EditText) findViewById(R.id.edtEffMortality2);
|
||||
guiTableHealth.add(edtEffMortality2, "efficacy_mortality");
|
||||
@ -2396,10 +2540,10 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
|
||||
if(spiCalibrConsumptionCheck.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiCalibrConsumptionCheck).updateAdapter(this);
|
||||
if(spiCalibrPrecipitation.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiCalibrPrecipitation).updateAdapter(this);
|
||||
if(spiEffControl.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiEffControl).updateAdapter(this);
|
||||
if(spiEffTypeImpact.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiEffTypeImpact).updateAdapter(this);
|
||||
//if(spiEffTypeImpact.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiEffTypeImpact).updateAdapter(this);
|
||||
if(spiEffMethod.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiEffMethod).updateAdapter(this);
|
||||
if(spiEffControl2.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiEffControl2).updateAdapter(this);
|
||||
if(spiEffTypeImpact2.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiEffTypeImpact2).updateAdapter(this);
|
||||
//if(spiEffTypeImpact2.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiEffTypeImpact2).updateAdapter(this);
|
||||
if(spiEffMethod2.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiEffMethod2).updateAdapter(this);
|
||||
if(spiHlthProtectiveClothingClean.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiHlthProtectiveClothingClean).updateAdapter(this);
|
||||
if(spiHlthClothingReserve.getClass().toString().indexOf("dbfields.AutoCompleteTextViewDB")!=-1) ((AutoCompleteTextViewDB)spiHlthClothingReserve).updateAdapter(this);
|
||||
@ -2614,7 +2758,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
|
||||
llEffPassedTime2.setVisibility(View.VISIBLE);
|
||||
llEffMethod2.setVisibility(View.VISIBLE);
|
||||
}else{
|
||||
((selectDB)spiEffTypeImpact2).setValue(null);
|
||||
//((selectDB)spiEffTypeImpact2).setValue(null);
|
||||
edtEffMortality2.setText("");
|
||||
edtEffPassedTime2.setText("");
|
||||
((selectDB)spiEffMethod2).setValue(null);
|
||||
|
||||
@ -1017,11 +1017,12 @@ class MyThread extends Thread
|
||||
mSemaphore.release(); //Отдаем семафор
|
||||
}
|
||||
|
||||
|
||||
//Выполняем задание на отправку/приём данных
|
||||
if(tsk != null)
|
||||
{
|
||||
Log.i("CCALM", "download task = "+tsk.name);
|
||||
if(tsk.name.equals("frmlocustdel_locations")){
|
||||
Log.i("CCALM", "download task = "+tsk.name + " time = " + tsk.t);
|
||||
if(tsk.name.equals("frmlocustdel")){
|
||||
Log.i("CCALM", "download task = "+tsk.name);
|
||||
}
|
||||
boolean bError=false;
|
||||
@ -1152,6 +1153,7 @@ class MyThread extends Thread
|
||||
bundle.putString("type", tsk.type); //Тип файла
|
||||
msg.setData(bundle);
|
||||
myHandle.sendMessage(msg);
|
||||
|
||||
}else{
|
||||
Log.e("CCALM", "ERROR URL = "+tsk.url+" responseCode"+String.valueOf(responseCode));
|
||||
}
|
||||
|
||||
@ -2521,7 +2521,7 @@
|
||||
android:background="@color/button_pink_normal_start"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
<!--LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
@ -2546,7 +2546,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0"
|
||||
android:background="@color/button_pink_normal_start"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout-->
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
@ -2560,18 +2560,12 @@
|
||||
android:layout_weight="1"
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/Type_of_assessed_biological_impact"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:enabled="false"
|
||||
android:focusable="false"
|
||||
android:clickable="false"/>
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"/>
|
||||
<EditText
|
||||
android:id="@+id/edtBiologicalImpact"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_column="1"
|
||||
android:layout_row="2"
|
||||
android:hint=""
|
||||
android:visibility="invisible" />
|
||||
android:visibility="gone" />
|
||||
<View
|
||||
android:layout_width="@dimen/activity_vertical_margin"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
@ -2416,7 +2416,7 @@
|
||||
android:background="@color/button_pink_normal_start"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
<!--LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
@ -2443,7 +2443,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0"
|
||||
android:background="@color/button_pink_normal_start"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout-->
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
@ -2463,10 +2463,7 @@
|
||||
android:id="@+id/edtBiologicalImpact"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_column="1"
|
||||
android:layout_row="2"
|
||||
android:hint=""
|
||||
android:visibility="invisible" />
|
||||
android:visibility="gone" />
|
||||
<View
|
||||
android:layout_width="@dimen/activity_vertical_margin"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
@ -1967,10 +1967,8 @@
|
||||
android:id="@+id/edtBiologicalImpact"
|
||||
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" />
|
||||
</LinearLayout>
|
||||
|
||||
<GridLayout
|
||||
|
||||
@ -2672,7 +2672,7 @@
|
||||
android:orientation="vertical">
|
||||
|
||||
|
||||
<LinearLayout
|
||||
<!--LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
@ -2697,7 +2697,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0"
|
||||
android:background="@color/button_pink_normal_start"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout-->
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
@ -2711,18 +2711,12 @@
|
||||
android:layout_weight="1"
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/Type_of_assessed_biological_impact"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:enabled="false"
|
||||
android:focusable="false"
|
||||
android:clickable="false"/>
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"/>
|
||||
<EditText
|
||||
android:id="@+id/edtBiologicalImpact"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_column="1"
|
||||
android:layout_row="2"
|
||||
android:hint=""
|
||||
android:visibility="invisible" />
|
||||
android:visibility="gone" />
|
||||
<View
|
||||
android:layout_width="@dimen/activity_vertical_margin"
|
||||
android:layout_height="match_parent"
|
||||
@ -2730,14 +2724,13 @@
|
||||
android:background="@color/button_pink_normal_start"/>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin">
|
||||
<GridLayout
|
||||
android:id="@+id/glEffTypeImpact"
|
||||
android:id="@+id/glBiologicalImpact"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
@ -2900,7 +2893,9 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
|
||||
|
||||
<!--LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
@ -2916,8 +2911,51 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
</LinearLayout-->
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/Type_of_assessed_biological_impact"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"/>
|
||||
<EditText
|
||||
android:id="@+id/edtEffTypeImpact"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin">
|
||||
<GridLayout
|
||||
android:id="@+id/glEffTypeImpact"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:columnCount="2"
|
||||
android:rowCount="2"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin">
|
||||
|
||||
<!-- CheckBox elements are created programmatically -->
|
||||
|
||||
</GridLayout>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/llEffMortality2"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@ -4,7 +4,7 @@ buildscript {
|
||||
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.3.2'
|
||||
@ -18,7 +18,7 @@ buildscript {
|
||||
allprojects {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
#Thu Dec 24 14:35:17 ALMT 2020
|
||||
#Mon Sep 01 19:24:02 ALMT 2025
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0-milestone-1-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
|
||||
|
||||
Reference in New Issue
Block a user