Правка формы уничножения саранчи

This commit is contained in:
Igor I
2024-05-04 17:15:59 +05:00
parent 55d2ca1997
commit 4a9f08849c
21 changed files with 185 additions and 422 deletions

View File

@ -1250,61 +1250,6 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="@dimen/activity_horizontal_margin">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_weight="1">
<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/edtWeaHumidityStart"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/Relative_humidity_start"
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"
android:gravity="center"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:layout_weight="1">
<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/edtWeaHumidityEnd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/Relative_humidity_end"
android:maxLines="1"
android:singleLine="true"
android:inputType="numberDecimal"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -1519,7 +1464,7 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
@ -1537,7 +1482,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"
@ -1567,7 +1512,7 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
@ -1585,9 +1530,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout-->
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
@ -1605,9 +1550,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout-->
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
@ -1625,6 +1570,26 @@
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">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star" />
<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/Main_purpose_of_treatment">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiMainPurpose"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout

View File

@ -1247,61 +1247,6 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="@dimen/activity_horizontal_margin">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_weight="1">
<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/edtWeaHumidityStart"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/Relative_humidity_start"
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"
android:gravity="center"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:layout_weight="1">
<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/edtWeaHumidityEnd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/Relative_humidity_end"
android:maxLines="1"
android:singleLine="true"
android:inputType="numberDecimal"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

View File

@ -1109,41 +1109,6 @@
android:inputType="numberDecimal" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/tvWeaHumidityStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Relative_humidity_start"
android:textAppearance="?android:attr/textAppearanceSmall" />
<EditText
android:id="@+id/edtWeaHumidityStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="10"
android:inputType="numberDecimal" />
<TextView
android:id="@+id/tvWeaHumidityEnd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Relative_humidity_end"
android:textAppearance="?android:attr/textAppearanceSmall" />
<EditText
android:id="@+id/edtWeaHumidityEnd"
android:layout_width="wrap_content"
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" >
@ -1306,7 +1271,7 @@
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
@ -1329,7 +1294,7 @@
android:id="@+id/spiImago"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout-->
<LinearLayout
android:layout_width="match_parent"
@ -1359,7 +1324,7 @@
android:inputType="numberDecimal" />
</LinearLayout>
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
@ -1382,9 +1347,9 @@
android:id="@+id/spiKuliguli"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout-->
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
@ -1407,9 +1372,9 @@
android:id="@+id/spiSwarm"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout-->
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
@ -1432,6 +1397,32 @@
android:id="@+id/spiSparse"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/tvSparse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Main_purpose_of_treatment"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/star"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#ff0000" />
<dbfields.SpinnerDB
android:id="@+id/spiMainPurpose"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout

View File

@ -1103,41 +1103,6 @@
android:inputType="numberDecimal" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/tvWeaHumidityStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Relative_humidity_start"
android:textAppearance="?android:attr/textAppearanceSmall" />
<EditText
android:id="@+id/edtWeaHumidityStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="10"
android:inputType="numberDecimal" />
<TextView
android:id="@+id/tvWeaHumidityEnd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Relative_humidity_end"
android:textAppearance="?android:attr/textAppearanceSmall" />
<EditText
android:id="@+id/edtWeaHumidityEnd"
android:layout_width="wrap_content"
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" >

View File

@ -1285,54 +1285,6 @@
</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/edtWeaHumidityStart"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/Relative_humidity_start"
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"
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/edtWeaHumidityEnd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/Relative_humidity_end"
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"
@ -1506,7 +1458,7 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
@ -1524,7 +1476,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"
@ -1554,7 +1506,7 @@
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
@ -1572,9 +1524,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout-->
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
@ -1592,9 +1544,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout-->
<LinearLayout
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
@ -1612,6 +1564,26 @@
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">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star" />
<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/Main_purpose_of_treatment">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiMainPurpose"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout

View File

@ -1282,54 +1282,6 @@
</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/edtWeaHumidityStart"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/Relative_humidity_start"
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"
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/edtWeaHumidityEnd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/Relative_humidity_end"
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"

View File

@ -327,4 +327,5 @@
<string name="Test_questionnaire">Test anketi</string>
<string name="Copy_polygon">Çoxbucaqlı kopyalansın?</string>
<string name="title_activity_locust_health">İnsan sağlığı və ətraf mühit</string>
<string name="Main_purpose_of_treatment">Müalicənin əsas məqsədi</string>
</resources>

View File

@ -337,4 +337,5 @@
<string name="Test_questionnaire">Թեստային հարցաթերթիկ</string>
<string name="Copy_polygon">Պատճենե՞լ բազմանկյունը:</string>
<string name="title_activity_locust_health">Մարդու և շրջակա միջավայրի առողջություն</string>
<string name="Main_purpose_of_treatment">Բուժման հիմնական նպատակը</string>
</resources>

View File

@ -328,4 +328,5 @@
<string name="Test_questionnaire">ტესტის კითხვარი</string>
<string name="Copy_polygon">დააკოპირეთ მრავალკუთხედი?</string>
<string name="title_activity_locust_health">ადამიანის და გარე გარემოცვას ჯანმრთელობა</string>
<string name="Main_purpose_of_treatment">მკურნალობის მთავარი მიზანი</string>
</resources>

View File

@ -332,4 +332,5 @@
<string name="Test_questionnaire">Тест анкетасы</string>
<string name="Copy_polygon">Көп бурчтук көчүрүлсүнбү?</string>
<string name="title_activity_locust_health">Инсандын сагаты жана айылдык мойнунун сагынуусы.</string>
<string name="Main_purpose_of_treatment">Дарылоонун негизги максаты</string>
</resources>

View File

@ -335,5 +335,6 @@
<string name="Test_questionnaire">Тест сауалнамасы</string>
<string name="Copy_polygon">Көпбұрышты көшіру керек пе?</string>
<string name="title_activity_locust_health">Адамның денсаулығы мен шектеулі аурухана.</string>
<string name="Main_purpose_of_treatment">Емдеудің негізгі мақсаты</string>
</resources>

View File

@ -340,4 +340,5 @@
<string name="Test_questionnaire">د ازموینې پوښتنلیک</string>
<string name="Copy_polygon">کاپي پولیګون؟</string>
<string name="title_activity_locust_health">زنده وجود د صحت او د محیطي خلکو سلامتي.</string>
<string name="Main_purpose_of_treatment">هدف اصلی درمان</string>
</resources>

View File

@ -343,4 +343,5 @@
<string name="Please_update_your_phone_tablet">Ваш смартфон/планшет устарел, пожалуйста обновите его</string>
<string name="Test_questionnaire">Тестовая анкета</string>
<string name="Copy_polygon">Скопировать полигон?</string>
<string name="Main_purpose_of_treatment">Основная цель при обработке</string>
</resources>

View File

@ -339,4 +339,5 @@
<string name="Test_questionnaire">Саволномаи тестӣ</string>
<string name="Copy_polygon">Бисёркунҷаро нусхабардорӣ кунед?</string>
<string name="title_activity_locust_health">Саломатии инсон ва муҳити зист</string>
<string name="Main_purpose_of_treatment">Мақсади асосии табобат</string>
</resources>

View File

@ -338,4 +338,5 @@
<string name="Test_questionnaire">Synag anketasy</string>
<string name="Copy_polygon">Köpburçlygy göçüriň?</string>
<string name="title_activity_locust_health">Adam döwleti we goraýyş ortalygyň saýlamlylygy.</string>
<string name="Main_purpose_of_treatment">Bejerginiň esasy maksady</string>
</resources>

View File

@ -340,4 +340,5 @@
<string name="Test_questionnaire">Test anketasi</string>
<string name="Copy_polygon">Kopburchak nusxalansinmi?</string>
<string name="title_activity_locust_health">Inson va atrof-muhit salomatligi</string>
<string name="Main_purpose_of_treatment">Davolashning asosiy maqsadi</string>
</resources>

View File

@ -344,4 +344,5 @@
<string name="Test_questionnaire">Test questionnaire</string>
<string name="Copy_polygon">Copy polygon?</string>
<string name="title_activity_locust_health">Human and environmental health</string>
<string name="Main_purpose_of_treatment">Main purpose of treatment</string>
</resources>