diff --git a/app/build.gradle b/app/build.gradle
index 532d0c8..cce34ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
defaultConfig {
applicationId "kz.istt.locust"
minSdkVersion 15
- versionCode 113
+ versionCode 114
versionName "3.0.10"
targetSdkVersion 35
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7244140..a34e8ec 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,97 +1,80 @@
-
+
+ tools:context=".MainActivity">
+
-
-
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:visibility="gone"
+ android:gravity="center"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent">
-
-
+
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:orientation="vertical"
+ android:gravity="center_horizontal|center_vertical"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/footerBlock"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent">
-
-
@@ -99,10 +82,8 @@
android:id="@+id/btnLocustDel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginTop="52dp"
- android:layout_marginLeft="62dp"
- android:layout_marginRight="62dp"
+ android:layout_marginHorizontal="62dp"
+ android:layout_marginTop="24dp"
android:minHeight="70dp"
android:text="@string/title_activity_locust_del"/>
@@ -110,10 +91,8 @@
android:id="@+id/btnLocustHealth"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginTop="52dp"
- android:layout_marginLeft="62dp"
- android:layout_marginRight="62dp"
+ android:layout_marginHorizontal="62dp"
+ android:layout_marginTop="24dp"
android:minHeight="70dp"
android:text="@string/Human_Health_and_Environment_HH_Env_Monitoring_Form"/>
@@ -121,28 +100,29 @@
android:id="@+id/btnSetup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="52dp"
- android:layout_marginLeft="62dp"
- android:layout_marginRight="62dp"
+ android:layout_marginHorizontal="62dp"
+ android:layout_marginTop="24dp"
android:minHeight="70dp"
android:text="@string/title_activity_setup"/>
-
+
+
+
+
+
-
-
+ android:layout_marginBottom="16dp"
+ android:gravity="end">
+
-
-
+ android:gravity="end"
+ android:paddingBottom="48dp">
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index bac4238..0777154 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -1,314 +1,257 @@
+ android:background="#FFFAB0">
+ android:id="@+id/mainScrollView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:padding="12dp"
+ android:paddingTop="40dp">
+ android:orientation="vertical">
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:layout_marginTop="32dp">
-
-
+ android:layout_marginLeft="10dp"
+ android:text="@string/action_synchronize"
+ android:textSize="16sp" />
+ android:textColor="#666666" />
+ android:layout_height="wrap_content"
+ android:stretchColumns="0,1">
-
-
-
-
-
-
-
-
+ android:layout_marginLeft="2dp"
+ android:text="@string/Armenia"
+ android:textSize="12sp" />
-
+
-
+
+ android:layout_marginLeft="2dp"
+ android:text="@string/Georgian"
+ android:textSize="12sp" />
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+ android:layout_marginLeft="2dp"
+ android:text="@string/Turkman"
+ android:textSize="12sp" />
-
-
-
-
-
-
-
+ android:layout_height="45dp"
+ android:layout_marginTop="2dp"
+ android:text="@string/Uzbek"
+ android:textSize="12sp" />
+
-
-
-
-
-
+ android:layout_height="45dp"
+ android:layout_marginTop="15dp"
+ android:text="@string/Authorize_the_tablet_by_QR_code" />
+ android:layout_marginTop="10dp"
+ android:text="@string/Show_advanced_settings" />
+ android:orientation="vertical"
+ android:visibility="gone">
-
+
+
-
-
+ android:layout_height="wrap_content"
+ android:hint="@string/URL_path_to_the_server"
+ android:textSize="14sp" />
-
+
+
+ android:layout_height="wrap_content"
+ android:hint="@string/Days_of_synchronization"
+ android:inputType="number"
+ android:textSize="14sp" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="45dp"
+ android:layout_marginTop="15dp"
+ android:text="@string/Delete_all_data" />
-
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 28d4b13..5a005d2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -22,18 +22,21 @@