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

app/build.gradle

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

app/src/main/res/layout-land/activity_locust.xml

@@ -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">
 

app/src/main/res/layout-land/activity_locust_del.xml

@@ -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

app/src/main/res/layout-land/activity_locust_health.xml

@@ -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

app/src/main/res/layout-large/activity_locust.xml

@@ -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">
 

app/src/main/res/layout-large/activity_locust_del.xml

@@ -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

app/src/main/res/layout-large/activity_locust_health.xml

@@ -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

app/src/main/res/layout/activity_image_pick.xml

@@ -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" >
 

app/src/main/res/layout/activity_locust.xml

@@ -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">
 

app/src/main/res/layout/activity_locust_del.xml

@@ -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>

app/src/main/res/layout/activity_locust_del_list.xml

@@ -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

app/src/main/res/layout/activity_locust_health.xml

@@ -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

app/src/main/res/layout/activity_locust_health_list.xml

@@ -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

app/src/main/res/layout/activity_locust_list.xml

@@ -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

app/src/main/res/layout/activity_main.xml

@@ -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" >
 

app/src/main/res/layout/activity_scan.xml

@@ -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

app/src/main/res/layout/activity_setup.xml

@@ -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" >