From cdba2fbccaec53ba6cdcab088325c7addb2c213b Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Wed, 31 Jul 2024 07:16:20 +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 +-
 .../res/layout-land/activity_locust_del.xml   | 41 +++++++++++++++++++
 .../res/layout-large/activity_locust_del.xml  | 38 +++++++++++++++++
 .../layout-large/activity_locust_health.xml   | 19 +++++++++
 4 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 63b9ba5..79fda3b 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-06-20T17:55:21.813240500Z">
+        <DropdownSelection timestamp="2024-07-30T15:06:27.253720500Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\igor\.android\avd\Pixel_8_Pro_API_34.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\igor\.android\avd\Pixel_Tablet_API_34.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/res/layout-land/activity_locust_del.xml b/app/src/main/res/layout-land/activity_locust_del.xml
index 46199f7..2ff648b 100644
--- a/app/src/main/res/layout-land/activity_locust_del.xml
+++ b/app/src/main/res/layout-land/activity_locust_del.xml
@@ -997,6 +997,47 @@
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/Commercial_product_diluted">
+                    <dbfields.AutoCompleteTextViewDB
+                        android:id="@+id/spiInsDiluted"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+                <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/edtInsProportion"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="@color/transparent"
+                        android:hint="@string/Working_fluid_dilution_ratio"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:inputType="numberDecimal"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
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 e58a87b..311477c 100644
--- a/app/src/main/res/layout-large/activity_locust_del.xml
+++ b/app/src/main/res/layout-large/activity_locust_del.xml
@@ -909,6 +909,44 @@
                     android:inputType="numberDecimal" />
             </LinearLayout>
 
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <TextView
+                    android:id="@+id/tvSprPlatformA"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/Commercial_product_diluted"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:paddingLeft="@dimen/activity_horizontal_margin"/>
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiInsDiluted"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+
+                <TextView
+                    android:id="@+id/tvInsRate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/Working_fluid_dilution_ratio"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+
+                <EditText
+                    android:id="@+id/edtInsProportion"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+            </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 9476b35..910dab2 100644
--- a/app/src/main/res/layout-large/activity_locust_health.xml
+++ b/app/src/main/res/layout-large/activity_locust_health.xml
@@ -1458,6 +1458,25 @@
                     android:inputType="numberDecimal" />
             </LinearLayout>
 
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/activity_horizontal_margin">
+
+                <TextView
+                    android:id="@+id/tvSprPlatformG"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/Ground_marking"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+
+                <dbfields.SpinnerDB
+                    android:id="@+id/spiSprMarking"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >