igor/org.ccalm.asdc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Почти доделал форму здоровья

Browse Source
This commit is contained in:
igor
2024-06-17 07:25:05 +05:00
parent 28c529fe7a
commit 2c29159b51
26 changed files with 7035 additions and 4597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
tools:context=".LocustDelActivity">
tools:context=".LocustHealthActivity">
<ScrollView
android:id="@+id/scrollView1"
@ -442,34 +442,32 @@
android:textColor="@color/text_title"
android:gravity="left|center"
android:background="#dddddd"
android:text="Идентификация места мониторинга"
android:text="@string/Identification_of_the_monitoring_site"
android:textStyle="bold"/>
</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"
android:background="@color/transparent"
app:boxBackgroundColor="@color/transparent">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtRiskAgriculturalPhase"
android:id="@+id/edtObserverHealth"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="Имя руководителя бригады по мониторингу ЗЧ и ОС"
android:hint="@string/Name_of_the_HH_Env_monitoring_team_leader"
android:maxLines="1"
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
@ -494,18 +492,18 @@
app:boxBackgroundColor="@color/transparent">
<dbfields.DateTimeTM
android:id="@+id/edtMonitoringDate2"
android:id="@+id/edtMonitoringDate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="Дата мониторинга"
android:hint="@string/Date_of_monitoring"
android:maxLines="1"
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
<EditText
android:id="@+id/edtTimeZone"
android:id="@+id/edtMonitoringTimeZone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="2dp"
@ -513,7 +511,7 @@
android:inputType="text"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnGetDate"
android:id="@+id/btnMonitoringGetDate"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -541,7 +539,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Заполнялась ли Форма по Мониторингу противосаранчовых обработок бригадой по обработке?">
android:hint="@string/Was_a_spray_monitoring_form_for_this_treatment_filled_out_by_the_control_team">
<dbfields.AutoCompleteTextViewDB
android:id="@+id/spiFrmLocustDelFilled"
android:layout_width="match_parent"
@ -869,12 +867,6 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="0dp">
<!--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"

25
app/src/main/res/layout/activity_setup.xml
View File

@ -201,6 +201,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/Identify_country_region" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -219,6 +220,30 @@
</LinearLayout>
<CheckBox
android:id="@+id/cbShowAdvancedSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/Show_advanced_settings" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.05"
android:orientation="horizontal">
<Button
android:id="@+id/btnDeleteAllData"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:minWidth="190dp"
android:minHeight="40dp"
android:layout_margin="2dp"
android:text="@string/Delete_all_data" />
</LinearLayout>
</LinearLayout>
</ScrollView>