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
2024-07-15 07:29:23 +05:00
parent dd2e9c4afe
commit 976d277a78
25 changed files with 1208 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/drawable/button.xml → app/src/main/res/drawable/button_blue.xml
View File

@ -4,7 +4,7 @@
<!-- Задаем элемент списка и описываем состояние при помощи атрибутов. -->
<!-- android:drawable - позволяет указать на XML-файл, который определяет фигуру -->
<!-- android:state_focused="true" - указывает использовать данное состояние, когда объект в фокусе -->
<item android:drawable="@drawable/button_focused" android:state_focused="true"/>
<item android:drawable="@drawable/button_presed" android:state_pressed="true"/>
<item android:drawable="@drawable/button_normal"/>
<item android:drawable="@drawable/button_blue_focused" android:state_focused="true"/>
<item android:drawable="@drawable/button_blue_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/button_blue_normal"/>
</selector>

0
app/src/main/res/drawable/button_focused.xml → app/src/main/res/drawable/button_blue_focused.xml
View File

23
app/src/main/res/drawable/button_blue_normal.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<stroke
android:width="1px"
android:color="#BB000000" />
<corners android:radius="12px" />
<gradient
android:angle="90"
android:endColor="@color/button_normal_color_end"
android:startColor="@color/button_normal_color_start"
android:type="linear" />
<padding
android:bottom="9px"
android:left="6px"
android:right="6px"
android:top="9px" />
</shape>

0
app/src/main/res/drawable/button_presed.xml → app/src/main/res/drawable/button_blue_pressed.xml
View File

49
app/src/main/res/drawable/button_normal.xml
View File

@ -1,49 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<stroke
android:width="1px"
android:color="#BB000000" />
<corners android:radius="12px" />
<gradient
android:angle="90"
android:endColor="@color/button_normal_color_end"
android:startColor="@color/button_normal_color_start"
android:type="linear" />
<padding
android:bottom="9px"
android:left="6px"
android:right="6px"
android:top="9px" />
<!--
<solid android:color="#F000" />
<stroke
android:width="1px"
android:color="#BB000000" />
<padding
android:bottom="7dp"
android:left="10dp"
android:right="10dp"
android:top="7dp" />
<corners
android:bottomLeftRadius="5dp"
android:bottomRightRadius="5dp"
android:topLeftRadius="5dp"
android:topRightRadius="5dp" />
<gradient
android:angle="90"
android:centerColor="#5b5bcd"
android:endColor="#6f6fcf"
android:startColor="#4747e0"
android:type="linear" />
-->
</shape>

10
app/src/main/res/drawable/button_pink.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Определение списка состояний -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Задаем элемент списка и описываем состояние при помощи атрибутов. -->
<!-- android:drawable - позволяет указать на XML-файл, который определяет фигуру -->
<!-- android:state_focused="true" - указывает использовать данное состояние, когда объект в фокусе -->
<item android:drawable="@drawable/button_pink_focused" android:state_focused="true"/>
<item android:drawable="@drawable/button_pink_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/button_pink_normal"/>
</selector>

27
app/src/main/res/drawable/button_pink_focused.xml Normal file
View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Корневым элементом должен быть объект share (холс) -->
<!-- android:shape - задает форму кнопки. В нашем случаем форма кнопки - прямоугольник -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<stroke
android:width="1px"
android:color="#BB000000" />
<!-- Устанавливаем значение радиуса скругления для всех углов прямоугольника -->
<corners android:radius="12px" />
<!-- Задаем линейный градиент для заливки прямоугольника -->
<gradient
android:angle="90"
android:endColor="@color/button_focused_color_end"
android:startColor="@color/button_focused_color_start"
android:type="linear" />
<!-- Задаем отступы текста кнопки относительно краев прямоугольника -->
<padding
android:bottom="9px"
android:left="6px"
android:right="6px"
android:top="9px" />
</shape>

24
app/src/main/res/drawable/button_pink_normal.xml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<stroke
android:width="1px"
android:color="#BB000000" />
<corners android:radius="12px" />
<gradient
android:angle="90"
android:endColor="#E96161"
android:startColor="#DF1F1F"
android:type="linear" />
<padding
android:bottom="9px"
android:left="6px"
android:right="6px"
android:top="9px" />
</shape>

27
app/src/main/res/drawable/button_pink_pressed.xml Normal file
View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<stroke
android:width="1px"
android:color="#BB000000" />
<corners android:radius="12px" />
<gradient
android:angle="270"
android:endColor="@color/button_pressed_color_end"
android:startColor="@color/button_pressed_color_start"
android:type="linear" />
<padding
android:bottom="9px"
android:left="6px"
android:right="6px"
android:top="9px" />
<!-- Толщина рамки прямоугольника -->
<stroke
android:width="2px"
android:color="#52B10C" />
</shape>

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

@ -6,7 +6,6 @@
android:background="@drawable/gradient_example"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
tools:context=".LocustHealthActivity">
<ScrollView
@ -19,13 +18,13 @@
android:layout_height="wrap_content"
android:divider="@drawable/spacer_medium"
android:orientation="vertical"
android:showDividers="middle">
android:showDividers="middle"
android:paddingRight="@dimen/activity_vertical_margin">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="0dp">
android:paddingLeft="@dimen/activity_horizontal_margin">
<TextView
android:layout_width="match_parent"
android:layout_height="40dp"
@ -50,7 +49,9 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/Country">
android:layout_weight="1"
android:hint="@string/Country"
android:background="@color/disable">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiCountry"
android:layout_width="match_parent"
@ -75,6 +76,8 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/disable"
android:hint="@string/Region">
<dbfields.AutoCompleteTextViewDB
@ -99,7 +102,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtArea"
@ -128,7 +131,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
@ -160,7 +163,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtObserver"
@ -192,7 +195,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<dbfields.DateTimeTM
@ -330,7 +333,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
@ -349,7 +352,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
@ -409,12 +412,12 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="0dp">
android:paddingLeft="@dimen/activity_horizontal_margin">
<com.google.android.material.button.MaterialButton
android:id="@+id/btnOnMap"
style="@style/Widget.MaterialComponents.Button.Icon"
@ -433,8 +436,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="0dp">
android:paddingLeft="@dimen/activity_horizontal_margin">
<TextView
android:layout_width="match_parent"
android:layout_height="40dp"
@ -648,6 +650,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Vegetation_type">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiVegType"
@ -695,7 +698,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtVegHeight"
@ -753,6 +756,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Del_Vegetation_cover">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiVegCover"
@ -774,7 +778,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtVegCrop"
@ -819,7 +823,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtInsName"
@ -923,7 +927,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtInsActiveSubstance"
@ -952,7 +956,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
@ -983,6 +987,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Formulation">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiInsFormulation"
@ -1004,7 +1009,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtInsDose"
@ -1031,6 +1036,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Commercial_product_diluted">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiInsDiluted"
@ -1052,7 +1058,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtInsProportion"
@ -1080,7 +1086,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtInsRate"
@ -1147,6 +1153,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Time_start">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiWeaTimeStart"
@ -1170,6 +1177,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Time_end">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiWeaTimeEnd"
@ -1192,7 +1200,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtWeaTemperatureStart"
@ -1220,7 +1228,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtWeaTemperatureEnd"
@ -1247,6 +1255,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Wind_direction_start">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiWindDirectionStart"
@ -1267,6 +1276,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Wind_direction_end">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiWindDirectionEnd"
@ -1287,6 +1297,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Spray_direction_start">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSprayDirectionStart"
@ -1307,6 +1318,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Spray_direction_end">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSprayDirectionEnd"
@ -1346,6 +1358,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Species">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiLocSpecies"
@ -1369,6 +1382,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Hopper_stages">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiLocHoppers"
@ -1413,7 +1427,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
@ -1444,6 +1458,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Main_purpose_of_treatment">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiMainPurpose"
@ -1483,6 +1498,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Spray_platform">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSprPlatform"
@ -1503,6 +1519,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Spray_platform_a">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSprPlatformA"
@ -1523,6 +1540,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Ground">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSprPlatformG"
@ -1543,6 +1561,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Spray_platform_h">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSprPlatformH"
@ -1562,7 +1581,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtSprManufacturer"
@ -1590,7 +1609,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtSprHeight"
@ -1709,6 +1728,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Type_of_treatment">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSprBarrier"
@ -1732,7 +1752,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtSprBarrierSpace"
@ -1762,7 +1782,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
@ -1790,6 +1810,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Ground_marking">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSprMarking"
@ -1813,7 +1834,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
@ -1871,7 +1892,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtInsUsedVolume"
@ -2231,6 +2252,7 @@
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Control_efficacy_conducted_control_team">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiEffectiveness"
@ -2270,6 +2292,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Type_of_assessed_biological_impact">
<dbfields.AutoCompleteTextViewDB
@ -2294,10 +2317,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtEffMortality"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -2324,7 +2348,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtEffTime"
@ -2350,6 +2374,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Method_of_biological_efficiency_estimation">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiEffMethod"
@ -2534,100 +2559,107 @@
android:textStyle="bold"/>
</LinearLayout>
<GridLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:columnCount="3"
android:rowCount="3"
android:paddingLeft="@dimen/activity_horizontal_margin">
<CheckBox
android:id="@+id/cbSafClothingGoggles"
android:layout_width="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:gravity="center">
<GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_column="0"
android:layout_gravity="left|top"
android:layout_row="0"
android:text="@string/Goggles"
android:enabled="false"
android:focusable="false"/>
android:columnCount="3"
android:rowCount="3"
android:background="@color/disable">
<CheckBox
android:id="@+id/cbSafClothingMasks"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_gravity="left|top"
android:layout_row="0"
android:text="@string/Masks"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbSafClothingGoggles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="0"
android:layout_gravity="left|top"
android:layout_row="0"
android:text="@string/Goggles"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbSafClothingGloves"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="2"
android:layout_gravity="left|top"
android:layout_row="0"
android:text="@string/Gloves"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbSafClothingMasks"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_gravity="left|top"
android:layout_row="0"
android:text="@string/Masks"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbSafClothingOveralls"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="0"
android:layout_gravity="left|top"
android:layout_row="1"
android:text="@string/Overalls"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbSafClothingGloves"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="2"
android:layout_gravity="left|top"
android:layout_row="0"
android:text="@string/Gloves"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbSafClothingCaps"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_gravity="left|top"
android:layout_row="1"
android:text="@string/Caps"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbSafClothingOveralls"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="0"
android:layout_gravity="left|top"
android:layout_row="1"
android:text="@string/Overalls"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbSafClothingBoots"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="2"
android:layout_gravity="left|top"
android:layout_row="1"
android:text="@string/Boots"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbSafClothingCaps"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_gravity="left|top"
android:layout_row="1"
android:text="@string/Caps"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbSafClothingAbsent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="0"
android:layout_gravity="left|top"
android:layout_row="2"
android:text="@string/Protection_is_absent"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbSafClothingBoots"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="2"
android:layout_gravity="left|top"
android:layout_row="1"
android:text="@string/Boots"
android:enabled="false"
android:focusable="false"/>
<EditText
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" />
</GridLayout>
<CheckBox
android:id="@+id/cbSafClothingAbsent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="0"
android:layout_gravity="left|top"
android:layout_row="2"
android:text="@string/Protection_is_absent"
android:enabled="false"
android:focusable="false"/>
<EditText
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" />
</GridLayout>
</LinearLayout>
<!-- Поле упразднили в форме борьбы с саранчой, теперь оно в форме здоровья -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -2645,9 +2677,7 @@
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiHlthProtectiveClothingClean"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:enabled="false"
android:focusable="false"/>
android:layout_height="wrap_content"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
@ -2773,6 +2803,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Operator_accidentally_exposed_to_insecticide_or_feeling_unwell">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiOperatorExposedInsecticide"
@ -2792,7 +2823,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtDescription"
@ -2867,75 +2898,80 @@
android:textStyle="bold"/>
<EditText
android:id="@+id/edtSafEmptyContainers"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="10dp"
android:layout_height="10dp"
android:hint=""
android:visibility="invisible" />
</LinearLayout>
<GridLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:columnCount="2"
android:rowCount="3"
android:paddingLeft="@dimen/activity_horizontal_margin">
<CheckBox
android:id="@+id/cbTripleRinsed"
android:layout_width="wrap_content"
<GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:text="@string/Farmer"
android:enabled="false"
android:focusable="false"/>
android:columnCount="2"
android:rowCount="3"
android:background="@color/disable"
android:paddingLeft="@dimen/activity_horizontal_margin">
<CheckBox
android:id="@+id/cbPunctured"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:text="@string/Shepherd"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbTripleRinsed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:text="@string/Farmer"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbTakenBackToBase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:text="@string/Beekeeper"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbPunctured"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:text="@string/Shepherd"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbLeftInField"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:text="@string/Villager"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbTakenBackToBase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:text="@string/Beekeeper"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbBuried"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:text="@string/Official"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbLeftInField"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:text="@string/Villager"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbBurned"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:text="@string/Other"
android:enabled="false"
android:focusable="false"/>
</GridLayout>
<CheckBox
android:id="@+id/cbBuried"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:text="@string/Official"
android:enabled="false"
android:focusable="false"/>
<CheckBox
android:id="@+id/cbBurned"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|top"
android:text="@string/Other"
android:enabled="false"
android:focusable="false"/>
</GridLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@ -2994,6 +3030,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Effect_on_non_terget_organism">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSafNonTarget"
@ -3013,7 +3050,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtSafNonTargetEffect"
@ -3134,6 +3171,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/disable"
android:hint="@string/Other_environmental_or_health_incident_reported_that_might_have_been_caused_by_the_treatment">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiSafIncident"
@ -3153,7 +3191,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:background="@color/disable"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtSafIncidentEffect"
@ -3225,17 +3263,21 @@
android:text="@string/Comments_problems"
android:textStyle="bold" />
</LinearLayout>
<EditText
android:id="@+id/edtComments"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="150dp"
android:ems="10"
android:inputType="textMultiLine"
android:enabled="false"
android:focusable="false"
android:paddingLeft="@dimen/activity_horizontal_margin"/>
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="@dimen/activity_horizontal_margin">
<EditText
android:id="@+id/edtComments"
android:layout_width="match_parent"
android:layout_height="150dp"
android:ems="10"
android:inputType="textMultiLine"
android:enabled="false"
android:focusable="false"
android:background="@color/disable"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

4
app/src/main/res/layout/activity_locust_health_list.xml
View File

@ -45,7 +45,7 @@
</ScrollView>
</LinearLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
<!--com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/btnAdd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -54,6 +54,6 @@
app:backgroundTint="@color/button_normal_color_start"
app:srcCompat="@android:drawable/ic_input_add"
app:tint="@android:color/white"
/>
/-->
</androidx.coordinatorlayout.widget.CoordinatorLayout>

1
app/src/main/res/layout/activity_main.xml
View File

@ -106,7 +106,6 @@
android:text="@string/title_activity_locust_del"/>
<Button
android:visibility="gone"
android:id="@+id/btnLocustHealth"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
app/src/main/res/menu/locust_del_list.xml
View File

@ -6,11 +6,11 @@
android:showAsAction="never"
android:title="@string/action_add"/>
<item
<!--item
android:id="@+id/itemDelete"
android:orderInCategory="101"
android:showAsAction="never"
android:title="@string/action_delete"/>
android:title="@string/action_delete"/-->
<!-- item
android:id="@+id/itemExport"

2
app/src/main/res/values/colors.xml
View File

@ -18,4 +18,6 @@
<color name="text_title">#000000</color>
<color name="disable">#40398A3C</color>
</resources>

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

@ -22,13 +22,19 @@
</style>
<style name="MyButtonTheme" parent="@android:style/Widget.Button">
<item name="android:background">@drawable/button</item>
<item name="android:background">@drawable/button_blue</item>
<item name="android:textColor">@color/White</item>
<item name="android:textStyle">bold</item>
</style>
<style name="ButtonPinkTheme" parent="@android:style/Widget.Button">
<item name="android:background">@drawable/button_pink</item>
<item name="android:textColor">@color/White</item>
<item name="android:textStyle">bold</item>
</style>
<style name="MyImageButtonTheme" parent="@android:style/Widget.ImageButton">
<item name="android:background">@drawable/button</item>
<item name="android:background">@drawable/button_blue</item>
<item name="android:textColor">@color/White</item>
<item name="android:textStyle">bold</item>
</style>