From 723c5a5415f11f09290f6a2b460709055d242865 Mon Sep 17 00:00:00 2001
From: Igor I <ivanov.i@istt.kz>
Date: Wed, 31 Jul 2024 17:56:56 +0500
Subject: [PATCH] =?UTF-8?q?+=D0=BF=D0=BE=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |    4 +-
 .../kz/istt/locust/LocustHealthActivity.java  |    1 -
 .../layout-land/activity_locust_health.xml    | 1112 +++++++++++++----
 .../res/layout-large/activity_locust_del.xml  |   35 +-
 .../layout-large/activity_locust_health.xml   |    2 +-
 .../res/layout/activity_locust_health.xml     |   22 +
 6 files changed, 922 insertions(+), 254 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 79fda3b..1b0e006 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-07-30T15:06:27.253720500Z">
+        <DropdownSelection timestamp="2024-07-31T03:43:56.671614800Z">
           <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_3a_API_34_extension_level_7_x86_64.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
index 4c6d7e9..2fb320a 100644
--- a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
+++ b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
@@ -1009,7 +1009,6 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 		edtCalibrPassesInterval = (EditText) findViewById(R.id.edtCalibrPassesInterval);
 		guiTableHealth.add(edtCalibrPassesInterval, "calibr_passes_interval");
 
-
 		//********** Контроль эфективности **********
 		//Контроль эфективности
 		spiEffControl = findViewById(R.id.spiEffControl);
diff --git a/app/src/main/res/layout-land/activity_locust_health.xml b/app/src/main/res/layout-land/activity_locust_health.xml
index 8221942..8dee451 100644
--- a/app/src/main/res/layout-land/activity_locust_health.xml
+++ b/app/src/main/res/layout-land/activity_locust_health.xml
@@ -5,7 +5,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/gradient_example"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".LocustHealthActivity">
 
@@ -22,7 +21,8 @@
             android:layout_alignParentTop="true"
             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"
@@ -52,12 +52,18 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Country">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiCountry"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -74,6 +80,7 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Region">
 
                     <dbfields.AutoCompleteTextViewDB
@@ -81,6 +88,11 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -107,6 +119,11 @@
                         android:maxLines="1"
                         android:singleLine="true" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -134,6 +151,11 @@
                         android:maxLines="1"
                         android:singleLine="true" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -163,6 +185,11 @@
                         android:maxLines="1"
                         android:singleLine="true" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -214,6 +241,11 @@
                     app:iconGravity="textStart"
                     app:iconPadding="0dp"
                     app:iconSize="24dp" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -229,6 +261,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:baselineAligned="false"
                     android:divider="@drawable/spacer_medium"
                     android:gravity="center"
@@ -300,16 +333,32 @@
                         app:iconPadding="0dp"
                         app:iconSize="24dp" />
                 </LinearLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
-            <ListView
-                android:id="@+id/latlonList"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:gravity="center">
+                <ListView
+                    android:id="@+id/latlonList"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -422,7 +471,7 @@
                     app:iconSize="24dp" />
             </LinearLayout>
 
-            <LinearLayout
+            <!--LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center">
@@ -441,7 +490,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout>
+            </LinearLayout-->
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -543,12 +592,18 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Vegetation_type">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiVegType"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
             <!--LinearLayout
                 android:layout_width="match_parent"
@@ -600,6 +655,11 @@
                         android:singleLine="true"
                         android:inputType="numberDecimal"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -614,12 +674,18 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Del_Vegetation_cover">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiVegCover"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -643,6 +709,11 @@
                         android:maxLines="1"
                         android:singleLine="true" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -685,6 +756,11 @@
                         android:maxLines="1"
                         android:singleLine="true" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -785,6 +861,11 @@
                         android:maxLines="1"
                         android:singleLine="true" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -812,6 +893,11 @@
                         android:singleLine="true"
                         android:inputType="text"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -826,12 +912,18 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Formulation">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiInsFormulation"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
 
@@ -857,6 +949,11 @@
                         android:singleLine="true"
                         android:inputType="numberDecimal"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -869,6 +966,7 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Commercial_product_diluted">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiInsDiluted"
@@ -877,6 +975,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -905,6 +1008,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -933,6 +1041,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1056,6 +1169,11 @@
                             android:layout_height="wrap_content" />
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1110,6 +1228,11 @@
                             android:inputType="numberDecimal"/>
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1150,6 +1273,11 @@
                             android:layout_height="wrap_content" />
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1190,6 +1318,11 @@
                             android:layout_height="wrap_content" />
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1220,12 +1353,18 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Species">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiLocSpecies"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1240,12 +1379,18 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Hopper_stages">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiLocHoppers"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1277,6 +1422,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1292,6 +1442,7 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Main_purpose_of_treatment">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiMainPurpose"
@@ -1300,6 +1451,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1329,12 +1485,18 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Spray_platform">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiSprPlatform"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1346,12 +1508,18 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Spray_platform_a">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiSprPlatformA"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1363,12 +1531,18 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Ground">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiSprPlatformG"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1380,12 +1554,18 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Spray_platform_h">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiSprPlatformH"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <!--LinearLayout
@@ -1427,6 +1607,11 @@
                         android:singleLine="true"
                         android:inputType="text"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1451,6 +1636,11 @@
                         android:singleLine="true"
                         android:inputType="numberDecimal"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1556,6 +1746,7 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Type_of_treatment">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiSprBarrier"
@@ -1564,6 +1755,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1594,6 +1790,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1625,6 +1826,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1637,6 +1843,7 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Ground_marking">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiSprMarking"
@@ -1645,6 +1852,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1676,6 +1888,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1705,6 +1922,40 @@
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtInsUsedVolume"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="@string/Total_volume_of_working_solution_actually_applied_l"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
+            </LinearLayout>
+
             <LinearLayout
                 android:baselineAligned="false"
                 android:layout_width="match_parent"
@@ -2039,6 +2290,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:baselineAligned="false"
                     android:divider="@drawable/spacer_medium"
                     android:gravity="center"
@@ -2046,9 +2298,9 @@
 
                     <com.google.android.material.textfield.TextInputLayout
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                        android:layout_weight="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:hint="@string/Control_efficacy_conducted_control_team">
                         <dbfields.AutoCompleteTextViewDB
                             android:id="@+id/spiEffectiveness"
@@ -2073,110 +2325,132 @@
                         app:iconSize="20dp"
                         app:cornerRadius="20dp"/>
                 </LinearLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-                <LinearLayout
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:paddingLeft="@dimen/activity_horizontal_margin">
-                    <com.google.android.material.textfield.TextInputLayout
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_weight="1"
+                    android:hint="@string/Type_of_assessed_biological_impact">
+
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiTypeImpact"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:hint="@string/Type_of_assessed_biological_impact">
+                        android:enabled="false"
+                        android:focusable="false" />
+                </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
+            </LinearLayout>
 
-                        <dbfields.AutoCompleteTextViewDB
-                            android:id="@+id/spiTypeImpact"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:enabled="false"
-                            android:focusable="false" />
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-
-                <LinearLayout
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center">
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/ic_star"
-                        android:contentDescription="@null"/>
-                    <com.google.android.material.textfield.TextInputLayout
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="@color/transparent"
-                        app:boxBackgroundColor="@color/transparent">
+                        android:hint="@string/Biological_efficiency_of_treatment"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
+            </LinearLayout>
 
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:background="@color/transparent"
-                            android:hint="@string/Biological_efficiency_of_treatment"
-                            android:maxLines="1"
-                            android:singleLine="true"
-                            android:inputType="numberDecimal"
-                            android:enabled="false"
-                            android:focusable="false"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-
-                <LinearLayout
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"/>
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center">
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/ic_star"
-                        android:contentDescription="@null"/>
-                    <com.google.android.material.textfield.TextInputLayout
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtEffTime"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="@color/transparent"
-                        app:boxBackgroundColor="@color/transparent">
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/edtEffTime"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:background="@color/transparent"
-                            android:hint="@string/Time_after_treatment_hours"
-                            android:maxLines="1"
-                            android:singleLine="true"
-                            android:inputType="numberDecimal"
-                            android:enabled="false"
-                            android:focusable="false"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
+                        android:hint="@string/Time_after_treatment_hours"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
+            </LinearLayout>
 
-                <LinearLayout
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:paddingLeft="@dimen/activity_horizontal_margin">
-                    <com.google.android.material.textfield.TextInputLayout
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_weight="1"
+                    android:hint="@string/Method_of_biological_efficiency_estimation">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiEffMethod"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:hint="@string/Method_of_biological_efficiency_estimation">
-                        <dbfields.AutoCompleteTextViewDB
-                            android:id="@+id/spiEffMethod"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:enabled="false"
-                            android:focusable="false"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
+                        android:enabled="false"
+                        android:focusable="false"/>
+                </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
 
@@ -2352,99 +2626,113 @@
                     android:textStyle="bold"/>
             </LinearLayout>
 
-            <GridLayout
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:columnCount="3"
-                android:rowCount="3"
+                android:gravity="center"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
-
-                <CheckBox
-                    android:id="@+id/cbSafClothingGoggles"
-                    android:layout_width="wrap_content"
+                <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:layout_weight="1"
+                    android:columnCount="3"
+                    android:rowCount="3"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
 
-                <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"/>
+
+                    <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>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
+            </LinearLayout>
 
-                <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
                 android:layout_width="match_parent"
@@ -2585,12 +2873,14 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+
                     android:src="@drawable/ic_star"
                     android:contentDescription="@null"/>
                 <com.google.android.material.textfield.TextInputLayout
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Operator_accidentally_exposed_to_insecticide_or_feeling_unwell">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiOperatorExposedInsecticide"
@@ -2599,6 +2889,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2624,6 +2919,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2684,75 +2984,85 @@
                     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:layout_weight="1"
+                    android:columnCount="2"
+                    android:rowCount="3"
+                    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>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -2811,6 +3121,7 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Effect_on_non_terget_organism">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiSafNonTarget"
@@ -2819,6 +3130,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2844,6 +3160,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2951,6 +3272,7 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Other_environmental_or_health_incident_reported_that_might_have_been_caused_by_the_treatment">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiSafIncident"
@@ -2959,6 +3281,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2984,6 +3311,11 @@
                         android:enabled="false"
                         android:focusable="false"/>
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2995,12 +3327,18 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:hint="@string/Any_follow_up_conducted_by_HH_Env_monitoring_team_regarding_an_observed_or_reported_environmental_effect">
                     <dbfields.AutoCompleteTextViewDB
                         android:id="@+id/spiSafControl"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -3043,15 +3381,26 @@
                     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:layout_weight="1"
+                    android:ems="10"
+                    android:inputType="textMultiLine"
+                    android:enabled="false"
+                    android:focusable="false"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -3161,6 +3510,303 @@
                     app:iconSize="24dp" />
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:baselineAligned="false"
+                android:divider="@drawable/spacer_medium"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:showDividers="middle">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtImage2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:enabled="false"
+                        android:focusable="false"
+                        android:hint="@string/Photos_of_the_treatment_situation_of_any_incidents"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnImage2"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_camera"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp">
+                </com.google.android.material.button.MaterialButton>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnShowImage2"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_photo"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnDelImage2"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_delete"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:baselineAligned="false"
+                android:divider="@drawable/spacer_medium"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:showDividers="middle">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtImage3"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:enabled="false"
+                        android:focusable="false"
+                        android:hint="@string/Photos_of_the_treatment_situation_of_any_incidents"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnImage3"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_camera"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp">
+                </com.google.android.material.button.MaterialButton>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnShowImage3"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_photo"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnDelImage3"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_delete"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:baselineAligned="false"
+                android:divider="@drawable/spacer_medium"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:showDividers="middle">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtImage4"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:enabled="false"
+                        android:focusable="false"
+                        android:hint="@string/Photos_of_the_treatment_situation_of_any_incidents"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnImage4"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_camera"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp">
+                </com.google.android.material.button.MaterialButton>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnShowImage4"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_photo"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnDelImage4"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_delete"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:baselineAligned="false"
+                android:divider="@drawable/spacer_medium"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:showDividers="middle">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/transparent"
+                    app:boxBackgroundColor="@color/transparent">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/edtImage5"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:enabled="false"
+                        android:focusable="false"
+                        android:hint="@string/Photos_of_the_treatment_situation_of_any_incidents"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnImage5"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_camera"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp">
+                </com.google.android.material.button.MaterialButton>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnShowImage5"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_photo"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnDelImage5"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_delete"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout-large/activity_locust_del.xml b/app/src/main/res/layout-large/activity_locust_del.xml
index 311477c..f4142cf 100644
--- a/app/src/main/res/layout-large/activity_locust_del.xml
+++ b/app/src/main/res/layout-large/activity_locust_del.xml
@@ -1734,28 +1734,29 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/Type_of_assessed_biological_impact"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <dbfields.SpinnerDB
-                    android:id="@+id/spiTypeImpact"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-
             <LinearLayout
                 android:id="@+id/llEffectiveness"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/Type_of_assessed_biological_impact"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+                    <dbfields.SpinnerDB
+                        android:id="@+id/spiTypeImpact"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" >
diff --git a/app/src/main/res/layout-large/activity_locust_health.xml b/app/src/main/res/layout-large/activity_locust_health.xml
index 910dab2..6e74535 100644
--- a/app/src/main/res/layout-large/activity_locust_health.xml
+++ b/app/src/main/res/layout-large/activity_locust_health.xml
@@ -1818,7 +1818,7 @@
                         android:text="@string/Control_efficacy_conducted_control_team"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
                     <dbfields.SpinnerDB
-                        android:id="@+id/spiEffectiveness"
+                        android:id="@+id/spiEffControl"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
                 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_locust_health.xml b/app/src/main/res/layout/activity_locust_health.xml
index 49068f0..f612e85 100644
--- a/app/src/main/res/layout/activity_locust_health.xml
+++ b/app/src/main/res/layout/activity_locust_health.xml
@@ -948,6 +948,28 @@
                         android:maxLines="1"
                         android:singleLine="true" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <EditText
+                    android:id="@+id/edtInsManufacturedTimeZone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:minWidth="2dp"
+                    android:visibility="invisible"
+                    android:inputType="text"/>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnInsManufacturedDate"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:insetLeft="0dp"
+                    android:insetTop="0dp"
+                    android:insetRight="0dp"
+                    android:insetBottom="0dp"
+                    android:minWidth="40dp"
+                    app:icon="@drawable/ic_clock"
+                    app:iconGravity="textStart"
+                    app:iconPadding="0dp"
+                    app:iconSize="24dp" />
             </LinearLayout>
 
             <LinearLayout