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

+Поля

Browse Source
This commit is contained in:
Igor I
2024-08-02 20:09:01 +05:00
parent 432cbb6460
commit 987e8da04f
8 changed files with 1050 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/deploymentTargetSelector.xml generated
View File

@ -4,10 +4,10 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2024-08-02T01:17:10.757633800Z">
<DropdownSelection timestamp="2024-08-02T15:07:00.024875400Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\igor\.android\avd\Pixel_Tablet_API_34.avd" />
<DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\ivanov.i\.android\avd\Pixel_Tablet_API_33.avd" />
</handle>
</Target>
</DropdownSelection>

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

@ -1394,9 +1394,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
llRiskHouseInformed.setVisibility(View.VISIBLE);
}else{
edtRiskHouseDistance.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskHouseBufferZones).setValue(null);
((dbfields.AutoCompleteTextViewDB)spiRiskHouseImpact).setValue(null);
((dbfields.AutoCompleteTextViewDB)spiRiskHouseInformed).setValue(null);
((selectDB)spiRiskHouseBufferZones).setValue(null);
((selectDB)spiRiskHouseImpact).setValue(null);
((selectDB)spiRiskHouseInformed).setValue(null);
llRiskHouseDistance.setVisibility(View.GONE);
llRiskHouseBufferZones.setVisibility(View.GONE);
llRiskHouseImpact.setVisibility(View.GONE);
@ -1455,8 +1455,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
llRiskWaterImpact.setVisibility(View.VISIBLE);
}else{
edtRiskWaterDistance.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskWaterBufferZones).setValue(null);
((dbfields.AutoCompleteTextViewDB)spiRiskWaterImpact).setValue(null);
((selectDB)spiRiskWaterBufferZones).setValue(null);
((selectDB)spiRiskWaterImpact).setValue(null);
llRiskWaterDistance.setVisibility(View.GONE);
llRiskWaterBufferZones.setVisibility(View.GONE);
llRiskWaterImpact.setVisibility(View.GONE);
@ -1510,9 +1510,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
llRiskApiaryImpact.setVisibility(View.VISIBLE);
}else{
edtRiskApiaryDistance.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskApiaryInformed).setValue(null);
((selectDB)spiRiskApiaryInformed).setValue(null);
edtRiskApiaryMeasure.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskAgriculturalInform).setValue(null);
((selectDB)spiRiskAgriculturalInform).setValue(null);
llRiskApiaryDistance.setVisibility(View.GONE);
llRiskApiaryInformed.setVisibility(View.GONE);
llRiskApiaryMeasure.setVisibility(View.GONE);
@ -1563,8 +1563,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
}else{
edtRiskAgriculturalName.setText("");
edtRiskAgriculturalPhase.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskAgriculturalToxic).setValue(null);
((dbfields.AutoCompleteTextViewDB)spiRiskAgriculturalInform).setValue(null);
((selectDB)spiRiskAgriculturalToxic).setValue(null);
((selectDB)spiRiskAgriculturalInform).setValue(null);
llRiskAgriculturalName.setVisibility(View.GONE);
llRiskAgriculturalPhase.setVisibility(View.GONE);
llRiskAgriculturalToxic.setVisibility(View.GONE);
@ -1624,9 +1624,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
llRiskSilkTreesImpact.setVisibility(View.VISIBLE);
}else{
edtRiskSilkDistance.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskSilkInform).setValue(null);
((selectDB)spiRiskSilkInform).setValue(null);
edtRiskSilkTreesMeasure.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskSilkTreesImpact).setValue(null);
((selectDB)spiRiskSilkTreesImpact).setValue(null);
llRiskSilkDistance.setVisibility(View.GONE);
llRiskSilkInform.setVisibility(View.GONE);
llRiskSilkTreesMeasure.setVisibility(View.GONE);
@ -1670,7 +1670,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
if(((selectDB)spiRiskPastures).getValue() != null && ((selectDB)spiRiskPastures).getValue().equals("1")) {
llRiskPasturesInform.setVisibility(View.VISIBLE);
}else{
((dbfields.AutoCompleteTextViewDB)spiRiskPasturesInform).setValue(null);
((selectDB)spiRiskPasturesInform).setValue(null);
llRiskPasturesInform.setVisibility(View.GONE);
}
}
@ -1706,8 +1706,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
}else{
edtRiskParkType.setText("");
edtRiskParkDistance.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskParkBufferZones).setValue(null);
((dbfields.AutoCompleteTextViewDB)spiRiskParkImpact).setValue(null);
((selectDB)spiRiskParkBufferZones).setValue(null);
((selectDB)spiRiskParkImpact).setValue(null);
llRiskParkType.setVisibility(View.GONE);
llRiskParkDistance.setVisibility(View.GONE);
@ -3241,9 +3241,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
llRiskHouseInformed.setVisibility(View.VISIBLE);
}else{
edtRiskHouseDistance.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskHouseBufferZones).setValue(null);
((dbfields.AutoCompleteTextViewDB)spiRiskHouseImpact).setValue(null);
((dbfields.AutoCompleteTextViewDB)spiRiskHouseInformed).setValue(null);
((selectDB)spiRiskHouseBufferZones).setValue(null);
((selectDB)spiRiskHouseImpact).setValue(null);
((selectDB)spiRiskHouseInformed).setValue(null);
llRiskHouseDistance.setVisibility(View.GONE);
llRiskHouseBufferZones.setVisibility(View.GONE);
llRiskHouseImpact.setVisibility(View.GONE);
@ -3261,8 +3261,10 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
llRiskWaterImpact.setVisibility(View.VISIBLE);
}else{
edtRiskWaterDistance.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskWaterBufferZones).setValue(null);
((dbfields.AutoCompleteTextViewDB)spiRiskWaterImpact).setValue(null);
((fieldDB)spiRiskWaterBufferZones).setValue(null);
((fieldDB)spiRiskWaterImpact).setValue(null);
llRiskWaterDistance.setVisibility(View.GONE);
llRiskWaterBufferZones.setVisibility(View.GONE);
llRiskWaterImpact.setVisibility(View.GONE);
@ -3281,9 +3283,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
llRiskApiaryImpact.setVisibility(View.VISIBLE);
}else{
edtRiskApiaryDistance.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskApiaryInformed).setValue(null);
((selectDB)spiRiskApiaryInformed).setValue(null);
edtRiskApiaryMeasure.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskAgriculturalInform).setValue(null);
((selectDB)spiRiskAgriculturalInform).setValue(null);
llRiskApiaryDistance.setVisibility(View.GONE);
llRiskApiaryInformed.setVisibility(View.GONE);
llRiskApiaryMeasure.setVisibility(View.GONE);
@ -3304,8 +3306,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
}else{
edtRiskAgriculturalName.setText("");
edtRiskAgriculturalPhase.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskAgriculturalToxic).setValue(null);
((dbfields.AutoCompleteTextViewDB)spiRiskAgriculturalInform).setValue(null);
((fieldDB)spiRiskAgriculturalToxic).setValue(null);
((fieldDB)spiRiskAgriculturalInform).setValue(null);
llRiskAgriculturalName.setVisibility(View.GONE);
llRiskAgriculturalPhase.setVisibility(View.GONE);
llRiskAgriculturalToxic.setVisibility(View.GONE);
@ -3325,9 +3327,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
llRiskSilkTreesImpact.setVisibility(View.VISIBLE);
}else{
edtRiskSilkDistance.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskSilkInform).setValue(null);
((fieldDB)spiRiskSilkInform).setValue(null);
edtRiskSilkTreesMeasure.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskSilkTreesImpact).setValue(null);
((fieldDB)spiRiskSilkTreesImpact).setValue(null);
llRiskSilkDistance.setVisibility(View.GONE);
llRiskSilkInform.setVisibility(View.GONE);
llRiskSilkTreesMeasure.setVisibility(View.GONE);
@ -3340,7 +3342,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
if(value != null && value.equals("1")) {
llRiskPasturesInform.setVisibility(View.VISIBLE);
}else{
((dbfields.AutoCompleteTextViewDB)spiRiskPasturesInform).setValue(null);
((fieldDB)spiRiskPasturesInform).setValue(null);
llRiskPasturesInform.setVisibility(View.GONE);
}
@ -3357,8 +3359,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
}else{
edtRiskParkType.setText("");
edtRiskParkDistance.setText("");
((dbfields.AutoCompleteTextViewDB)spiRiskParkBufferZones).setValue(null);
((dbfields.AutoCompleteTextViewDB)spiRiskParkImpact).setValue(null);
((fieldDB)spiRiskParkBufferZones).setValue(null);
((fieldDB)spiRiskParkImpact).setValue(null);
llRiskParkType.setVisibility(View.GONE);
llRiskParkDistance.setVisibility(View.GONE);

22
app/src/main/res/drawable/spinner_background.xml Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@android:color/transparent"/>
<stroke
android:width="0dp"
android:color="@android:color/transparent"/>
</shape>
</item>
<item android:bottom="0dp" android:right="0dp" android:left="0dp">
<shape android:shape="rectangle">
<solid android:color="@android:color/transparent"/>
<stroke android:width="1dp" android:color="@android:color/darker_gray"/>
</shape>
</item>
<item android:right="8dp" android:gravity="end|center_vertical">
<bitmap
android:src="@android:drawable/arrow_down_float"
android:gravity="center"/>
</item>
</layer-list>

28
app/src/main/res/layout-land/activity_locust_health.xml
View File

@ -3918,6 +3918,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskHouseImpact"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -3935,6 +3936,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskHouseInformed"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -3998,6 +4000,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskWaterDistance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4023,6 +4026,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskWaterBufferZones"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4040,6 +4044,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskWaterImpact"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4104,6 +4109,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskApiaryDistance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4129,6 +4135,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskApiaryInformed"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4146,6 +4153,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskApiaryMeasure"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4171,6 +4179,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskApiaryImpact"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4210,6 +4219,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskAgriculturalName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4235,6 +4245,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskAgriculturalPhase"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4260,6 +4271,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskAgriculturalToxic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4277,6 +4289,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskAgriculturalInform"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4292,8 +4305,6 @@
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -4342,6 +4353,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskSilkDistance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4367,6 +4379,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskSilkInform"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4384,6 +4397,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskSilkTreesMeasure"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4409,6 +4423,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskSilkTreesImpact"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4448,6 +4463,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskPasturesInform"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4511,6 +4527,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskParkType"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4521,7 +4538,6 @@
android:layout_weight="1"
android:background="@color/transparent"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtRiskParkType"
android:layout_width="match_parent"
@ -4537,6 +4553,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskParkDistance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4562,6 +4579,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskParkBufferZones"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4579,6 +4597,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskParkImpact"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4634,6 +4653,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskProbeAnalysisName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -4644,7 +4664,6 @@
android:layout_weight="1"
android:background="@color/transparent"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtRiskProbeAnalysisName"
android:layout_width="match_parent"
@ -4660,6 +4679,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llRiskProbeAnalysisNumber"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"

1100
app/src/main/res/layout-large/activity_locust_health.xml
View File

File diff suppressed because it is too large Load Diff

2
app/src/main/res/layout/activity_locust_health.xml
View File

@ -4466,7 +4466,6 @@
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -4832,7 +4831,6 @@
android:layout_weight="1"
android:background="@color/transparent"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtRiskProbeAnalysisName"
android:layout_width="match_parent"

3
app/src/main/res/values/dimens.xml
View File

@ -11,4 +11,7 @@
<dimen name="font_size">20sp</dimen>
<dimen name="minHeight">40dp</dimen>
</resources>

10
app/src/main/res/values/styles.xml
View File

@ -46,4 +46,14 @@
<item name="android:colorAccent">@color/colorPrimaryDark</item>
</style>
<style name="SpinnerStyle" parent="Widget.AppCompat.Spinner.Underlined">
<item name="android:background">@drawable/spinner_background</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:paddingStart">16dp</item>
<item name="android:paddingEnd">16dp</item>
<item name="android:popupBackground">@android:color/white</item>
</style>
</resources>