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

Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop

Browse Source
This commit is contained in:
igor
2026-04-04 14:26:12 +05:00
parent d1b23716c3 0c816b4870
commit 2c355d1898
17 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -13,9 +13,9 @@ android {
defaultConfig {
applicationId "kz.istt.locust"
minSdkVersion 15
versionCode 110
versionName "3.0.7"
targetSdkVersion 34
versionCode 113
versionName "3.0.9"
targetSdkVersion 35
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
}

1
app/src/main/res/layout-land/activity_locust.xml
View File

@ -7,6 +7,7 @@
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:fitsSystemWindows="true"
android:screenOrientation="portrait"
tools:context=".LocustActivity">

1
app/src/main/res/layout-land/activity_locust_del.xml
View File

@ -7,6 +7,7 @@
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustDelActivity">
<ScrollView

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

@ -6,6 +6,7 @@
android:background="@drawable/gradient_example"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustHealthActivity">
<ScrollView

1
app/src/main/res/layout-large/activity_locust.xml
View File

@ -7,6 +7,7 @@
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
android:screenOrientation="portrait"
tools:context=".LocustActivity">

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

@ -7,6 +7,7 @@
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustDelActivity">
<ScrollView

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

@ -6,6 +6,7 @@
android:background="@drawable/gradient_example"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustHealthActivity">
<ScrollView

1
app/src/main/res/layout/activity_image_pick.xml
View File

@ -6,6 +6,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
android:background="@drawable/gradient_example"
tools:context=".ImagePickActivity" >

1
app/src/main/res/layout/activity_locust.xml
View File

@ -7,6 +7,7 @@
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
android:screenOrientation="portrait"
tools:context=".LocustActivity">

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

@ -7,6 +7,7 @@
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:fitsSystemWindows="true"
tools:context=".LocustDelActivity">
<ScrollView
@ -2524,6 +2525,9 @@
</LinearLayout>
</LinearLayout>
</ScrollView>
</RelativeLayout>

1
app/src/main/res/layout/activity_locust_del_list.xml
View File

@ -9,6 +9,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustDelListActivity" >
<LinearLayout

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

@ -6,6 +6,7 @@
android:background="@drawable/gradient_example"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustHealthActivity">
<ScrollView

1
app/src/main/res/layout/activity_locust_health_list.xml
View File

@ -9,6 +9,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustHealthListActivity" >
<LinearLayout

1
app/src/main/res/layout/activity_locust_list.xml
View File

@ -8,6 +8,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustListActivity" >
<LinearLayout

1
app/src/main/res/layout/activity_main.xml
View File

@ -3,6 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dp"
android:fitsSystemWindows="true"
android:background="@drawable/gradient_example"
tools:context=".MainActivity" >

1
app/src/main/res/layout/activity_scan.xml
View File

@ -9,6 +9,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustDelListActivity" >
<LinearLayout

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

@ -7,6 +7,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
android:configChanges = "orientation|keyboard"
tools:context=".SetupActivity" >