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 
# Conflicts:
#	app/src/main/java/kz/istt/locust/LocustHealthActivity.java
This commit is contained in:
igor
2024-08-15 17:13:42 +05:00
parent bb99f1644e 7cfe8f1ff4
commit 0b7bd6e428
11 changed files with 519 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout-large/activity_locust_del.xml
View File

@ -2193,7 +2193,7 @@
android:id="@+id/tvSafNonTarget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Effect_on_non_terget_organism"
android:text="@string/Effect_on_non_target_organism"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
<dbfields.SpinnerDB

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

@ -505,6 +505,85 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:divider="@drawable/spacer_medium"
android:showDividers="middle">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star"
android:contentDescription="@null"
android:layout_gravity="center_vertical"/>
<TextView
android:id="@+id/tvLatCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Lat_center"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
<EditText
android:id="@+id/edtLatCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="10"
android:enabled="false"
android:inputType="numberDecimal" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star"
android:contentDescription="@null"
android:layout_gravity="center_vertical"/>
<TextView
android:id="@+id/tvLonCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Lon_center"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
<EditText
android:id="@+id/edtLonCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="10"
android:enabled="false"
android:inputType="numberDecimal" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnGetGPSCenter"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:insetLeft="0dp"
android:insetTop="0dp"
android:insetRight="0dp"
android:insetBottom="0dp"
android:minWidth="40dp"
app:icon="@drawable/ic_location"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconSize="24dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnDelGPSCenter"
style="@style/Widget.MaterialComponents.Button.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:insetLeft="0dp"
android:insetTop="0dp"
android:insetRight="0dp"
android:insetBottom="0dp"
android:minWidth="40dp"
app:icon="@drawable/ic_delete"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:iconSize="24dp" />
</LinearLayout>
<!--LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<ImageView
@ -531,7 +610,7 @@
android:layout_height="wrap_content"
style="@style/SpinnerStyle"
android:minHeight="@dimen/minHeight"/>
</LinearLayout>
</LinearLayout-->
<LinearLayout
android:layout_width="match_parent"
@ -1701,14 +1780,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/Mechanical_safety_any_insecticide_leakage_observed"
android:textAppearance="?android:attr/textAppearanceSmall" />
<dbfields.SpinnerDB
android:id="@+id/spiSprLeak"
android:layout_width="match_parent"
@ -1718,6 +1795,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSprLeakPlace"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -1727,7 +1805,7 @@
android:text="@string/If_Yes_which_part_of_the_sprayer_shows_leakage"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<EditText
android:id="@+id/edtSprLeakPlase"
android:id="@+id/edtSprLeakPlace"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -1756,6 +1834,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSprDamagePlace"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -1765,7 +1844,7 @@
android:text="@string/If_Yes_what_kind_of_damage"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<EditText
android:id="@+id/edtSprDamagePlase"
android:id="@+id/edtSprDamagePlace"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -2105,6 +2184,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrTime"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -2124,6 +2204,7 @@
android:inputType="numberDecimal" />
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrVolume"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -2143,6 +2224,7 @@
android:inputType="numberDecimal" />
</LinearLayout>
<LinearLayout
android:id="@+id/llCalibrRate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">
@ -3125,7 +3207,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/Effect_on_non_terget_organism"
android:text="@string/Effect_on_non_target_organism"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold"
android:enabled="false"/>
@ -3376,6 +3458,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llSafControlActions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin">