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

Merge branch 'master' of https://git.dirt.kz/igor/ASDC

Browse Source
This commit is contained in:
igor
2024-08-17 11:27:43 +05:00
parent e00dd77c9e 919c0069a1
commit 25348018ac
4 changed files with 127 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout-land/activity_locust_health.xml
View File

@ -2958,6 +2958,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llHlthClothingState"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -3287,6 +3288,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSafTypePollution"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -3391,6 +3393,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSafNonTargetEffect2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -3414,6 +3417,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSafNonTargetEffectPerson"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"

85
app/src/main/res/layout-large/activity_locust_health.xml
View File

@ -2823,6 +2823,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llHlthClothingState"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -2831,11 +2832,6 @@
android:layout_height="wrap_content"
android:text="@string/Remarks_with_respect_to_type_and_state_of_protective_clothing"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
<EditText
android:id="@+id/edtHlthClothingState"
android:layout_width="0dp"
@ -3175,6 +3171,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSafTypePollution"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -3183,12 +3180,6 @@
android:layout_height="wrap_content"
android:text="@string/If_yes_where_and_what_type_of_contamination"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
<EditText
android:id="@+id/edtSafTypePollution"
android:layout_width="match_parent"
@ -3292,6 +3283,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSafNonTargetEffect2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -3300,12 +3292,6 @@
android:layout_height="wrap_content"
android:text="@string/If_yes_where_and_what_type_of_effect"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
<EditText
android:id="@+id/edtSafNonTargetEffect2"
android:layout_width="match_parent"
@ -3317,46 +3303,49 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSafNonTargetEffectPerson"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
android:paddingLeft="@dimen/activity_horizontal_margin"
android:orientation="vertical"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/If_reported_by_another_person_by_whom"
android:textAppearance="?android:attr/textAppearanceSmall" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/edtSafNonTargetEffectPerson"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:importantForAutofill="no"
android:autofillHints=""
android:ems="10"
android:inputType="text" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnSafNonTargetEffectPerson"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:insetLeft="0dp"
android:insetTop="0dp"
android:insetRight="0dp"
android:insetBottom="0dp"
android:minWidth="20dp"
app:icon="@drawable/ic_information"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconSize="20dp"
app:cornerRadius="20dp"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
<EditText
android:id="@+id/edtSafNonTargetEffectPerson"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:importantForAutofill="no"
android:autofillHints=""
android:ems="10"
android:inputType="text" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnSafNonTargetEffectPerson"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:insetLeft="0dp"
android:insetTop="0dp"
android:insetRight="0dp"
android:insetBottom="0dp"
android:minWidth="20dp"
app:icon="@drawable/ic_information"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconSize="20dp"
app:cornerRadius="20dp"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"

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

@ -3100,6 +3100,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llHlthClothingState"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -3431,6 +3432,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSafTypePollution"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -3535,6 +3537,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSafNonTargetEffect2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -3564,6 +3567,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin">
<LinearLayout
android:id="@+id/llSafNonTargetEffectPerson"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"