Проверка на обязательные поля в новой форме

2024-08-17 11:27:23 +05:00
parent b6620a537a
commit e00dd77c9e
3 changed files with 211 additions and 407 deletions
--- a/app/src/main/res/layout/activity_locust_health.xml
+++ b/app/src/main/res/layout/activity_locust_health.xml
@ -16,6 +16,7 @@
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+            android:baselineAligned="false"
            android:divider="@drawable/spacer_medium"
            android:orientation="vertical"
            android:showDividers="middle"
@ -24,6 +25,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:paddingLeft="@dimen/activity_horizontal_margin">
                <TextView
                    android:layout_width="match_parent"
@ -39,6 +41,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -72,6 +75,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">

                <ImageView
@ -107,6 +111,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -140,6 +145,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -174,6 +180,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">

                <ImageView
@ -210,6 +217,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">

                <ImageView
@ -344,6 +352,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">

                <ImageView
@ -441,6 +450,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ListView
                    android:id="@+id/latlonList"
@ -461,6 +471,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin">
                <com.google.android.material.button.MaterialButton
@ -481,6 +492,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:paddingLeft="@dimen/activity_horizontal_margin">
                <TextView
                    android:layout_width="match_parent"
@ -496,6 +508,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -523,6 +536,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">

                <ImageView
@ -576,6 +590,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">

                <ImageView
@ -683,6 +698,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
                <TextView
@ -699,6 +715,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -727,6 +744,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -755,6 +773,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
                <TextView
@ -771,6 +790,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -825,6 +845,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -887,6 +908,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -915,9 +937,9 @@
            </LinearLayout>

            <LinearLayout
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -948,6 +970,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
                <TextView
@ -964,6 +987,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -995,9 +1019,9 @@
            </LinearLayout>

            <LinearLayout
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1022,6 +1046,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1070,6 +1095,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -1103,6 +1129,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -1138,6 +1165,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -1166,9 +1194,9 @@
            </LinearLayout>

            <LinearLayout
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1200,6 +1228,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1225,9 +1254,9 @@
            </LinearLayout>

            <LinearLayout
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1257,9 +1286,9 @@
            </LinearLayout>

            <LinearLayout
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1291,6 +1320,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1310,6 +1340,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
                <TextView
@ -1327,6 +1358,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -1357,6 +1389,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -1386,9 +1419,9 @@


            <LinearLayout
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1418,9 +1451,9 @@
            </LinearLayout>

            <LinearLayout
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1452,6 +1485,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1479,6 +1513,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1506,6 +1541,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1533,6 +1569,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1560,6 +1597,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
                <TextView
@ -1576,6 +1614,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -1606,6 +1645,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -1658,6 +1698,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -1693,6 +1734,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -1723,6 +1765,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
                <TextView
@ -1739,6 +1782,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -1769,6 +1813,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1796,6 +1841,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1823,6 +1869,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1845,9 +1892,9 @@
            </LinearLayout>

            <LinearLayout
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1877,9 +1924,9 @@
            </LinearLayout>

            <LinearLayout
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1911,6 +1958,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1929,9 +1977,9 @@

            <LinearLayout
                android:id="@+id/llSprLeakPlace"
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1957,6 +2005,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -1975,9 +2024,9 @@

            <LinearLayout
                android:id="@+id/llSprDamagePlace"
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -2003,6 +2052,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -2033,6 +2083,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -2067,6 +2118,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -2101,6 +2153,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -2128,6 +2181,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -2160,9 +2214,9 @@
            </LinearLayout>

            <LinearLayout
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -2189,6 +2243,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -2221,9 +2276,9 @@
            </LinearLayout>

            <LinearLayout
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -2251,6 +2306,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -2269,9 +2325,9 @@

            <LinearLayout
                android:id="@+id/llSprDescription"
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -2296,6 +2352,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
                <TextView
@ -2312,6 +2369,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -2334,9 +2392,9 @@
            <!-- The following 3 submenus (fields) appear if yes is selected, by default the fields below are hidden -->
            <LinearLayout
                android:id="@+id/llCalibrTime"
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -2361,9 +2419,9 @@
            </LinearLayout>
            <LinearLayout
                android:id="@+id/llCalibrVolume"
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -2388,9 +2446,9 @@
            </LinearLayout>
            <LinearLayout
                android:id="@+id/llCalibrRate"
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -2417,6 +2475,7 @@
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center">
                <ImageView
                    android:layout_width="wrap_content"
@ -2438,9 +2497,9 @@

            <LinearLayout
                android:id="@+id/llCalibrWidthCard"
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -2466,9 +2525,9 @@

            <LinearLayout
                android:id="@+id/llCalibrWindSpeed"
-                android:baselineAligned="false"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin"
                android:paddingRight="0dp">
@ -4952,6 +5011,7 @@
                android:id="@+id/llRiskProbeAnalysisName"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:baselineAligned="false"
                android:gravity="center"
                android:paddingLeft="@dimen/activity_horizontal_margin">
                <com.google.android.material.textfield.TextInputLayout