From bfef557d60ab26caa55a9ae7c82948c921c986e3 Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Sat, 4 Apr 2026 14:49:30 +0500
Subject: [PATCH 1/4] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e886109..532d0c8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ android {
         applicationId "kz.istt.locust"
         minSdkVersion 15
         versionCode 113
-        versionName "3.0.9"
+        versionName "3.0.10"
         targetSdkVersion 35
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
@@ -39,7 +39,7 @@ android {
         targetCompatibility JavaVersion.VERSION_21
     }
     namespace 'kz.istt.locust'
-    compileSdk 34
+    compileSdk 35
 }
 
 dependencies {

From 410ad1139adf628e0d75522a6edbd11620a84b63 Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Sat, 4 Apr 2026 20:30:19 +0500
Subject: [PATCH 2/4] gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 0c996ef..40e2b4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.iml
 .gradle
+/app
 /local.properties
 /.idea/libraries
 /.idea/modules.xml

From 6ea173b423aa00f89972dd2ea0c808e03a572197 Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Sat, 4 Apr 2026 20:45:17 +0500
Subject: [PATCH 3/4] New style

---
 app/build.gradle                           |   2 +-
 app/src/main/res/layout/activity_main.xml  | 133 +++----
 app/src/main/res/layout/activity_setup.xml | 403 +++++++++------------
 app/src/main/res/values/styles.xml         |   3 +
 4 files changed, 231 insertions(+), 310 deletions(-)

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 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="10dp"
-    android:fitsSystemWindows="true"
     android:background="@drawable/gradient_example"
-    tools:context=".MainActivity" >
+    tools:context=".MainActivity">
 
+    <!-- Progress Block -->
     <LinearLayout
         android:id="@+id/pBar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-
-        android:orientation="vertical">
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"/>
+        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">
 
         <TextView
             android:id="@+id/tvProgressInfo"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
             android:gravity="center"
             android:text="Synchronize directories through the Internet!"
-            android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceMedium"/>
 
         <ProgressBar
             android:id="@+id/progress"
             style="?android:attr/progressBarStyleLarge"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="16dp"
             android:layout_marginBottom="8dp"/>
 
         <TextView
             android:id="@+id/tvCountTasks"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
             android:gravity="center"
             android:text="@string/action_synchronize"
-            android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"/>
-
     </LinearLayout>
 
+    <!-- Main Form -->
     <LinearLayout
         android:id="@+id/form"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:visibility="gone"
-        android:orientation="vertical">
+        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">
 
         <TextView
             android:id="@+id/textView1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
             android:gravity="center"
             android:text="@string/Fields_marked_are_mandatory"
-            android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"/>
-
         <Button
             android:id="@+id/btnLocust"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginLeft="62dp"
-            android:layout_marginRight="62dp"
+            android:layout_marginHorizontal="62dp"
+            android:layout_marginTop="32dp"
             android:minHeight="70dp"
             android:text="@string/title_activity_locust"/>
 
@@ -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"/>
 
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"/>
+    </LinearLayout>
 
+    <!-- Footer -->
+    <LinearLayout
+        android:id="@+id/footerBlock"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <!-- Version -->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignRight="@+id/textView1"
-            android:layout_marginBottom="46dp">
-
-            <Space
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"/>
+            android:layout_marginBottom="16dp"
+            android:gravity="end">
 
             <TextView
                 android:id="@+id/tvV"
@@ -158,18 +138,12 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"/>
         </LinearLayout>
 
+        <!-- App ID -->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/textView1"
-            android:layout_alignParentBottom="true"
-            android:layout_alignRight="@+id/textView1"
-            android:layout_marginBottom="16dp">
-
-            <Space
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"/>
+            android:gravity="end"
+            android:paddingBottom="48dp">
 
             <TextView
                 android:id="@+id/tvID"
@@ -186,4 +160,5 @@
         </LinearLayout>
 
     </LinearLayout>
-</RelativeLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/gradient_example"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    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" >
+    android:background="#FFFAB0">
 
     <ScrollView
-        android:id="@+id/scrollView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true" >
+        android:id="@+id/mainScrollView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:padding="12dp"
+        android:paddingTop="40dp">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/scrollView1"
-            android:layout_below="@+id/scrollView1"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:layout_marginTop="32dp">
 
-                <Button
+                <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/btnSynchronization"
+                    style="@style/MyButtonTheme"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
-                    android:minHeight="40dp"
-                    android:minWidth="120dp"
+                    android:layout_height="40dp"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
                     android:text="@string/action_synchronize" />
 
                 <TextView
                     android:id="@+id/tvSynchronization"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/action_synchronize" 
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
-
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/action_synchronize"
+                    android:textSize="16sp" />
             </LinearLayout>
 
             <TextView
-                android:id="@+id/textView1"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
                 android:text="@string/To_change_the_language_you_need_to_restart_the_application"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textColor="#666666" />
 
             <TableLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content"
+                android:stretchColumns="0,1">
 
                 <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-                    <Button
+                    android:layout_marginBottom="4dp"
+                    android:baselineAligned="false">
+                    <androidx.appcompat.widget.AppCompatButton
                         android:id="@+id/btnAz"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        style="@style/MyButtonTheme"
+                        android:layout_width="0dp"
+                        android:layout_height="45dp"
                         android:layout_weight="1"
-                        android:minWidth="190dp"
-                        android:minHeight="40dp"
-                        android:layout_margin="2dp"
-                        android:text="@string/Azerbaijani" />
-                    <Button
+                        android:layout_marginRight="2dp"
+                        android:text="@string/Azerbaijani"
+                        android:textSize="12sp" />
+                    <androidx.appcompat.widget.AppCompatButton
                         android:id="@+id/btnAr"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        style="@style/MyButtonTheme"
+                        android:layout_width="0dp"
+                        android:layout_height="45dp"
                         android:layout_weight="1"
-                        android:minWidth="190dp"
-                        android:minHeight="40dp"
-                        android:layout_margin="2dp"
-                        android:text="@string/Armenia" />
-                </TableRow>
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-                    <Button
-                        android:id="@+id/btnEn"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:minWidth="190dp"
-                        android:minHeight="40dp"
-                        android:layout_margin="2dp"
-                        android:text="@string/English" />
-                    <Button
-                        android:id="@+id/btnGr"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:minWidth="190dp"
-                        android:minHeight="40dp"
-                        android:layout_margin="2dp"
-                        android:text="@string/Georgian" />
-                </TableRow>
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-                    <Button
-                        android:id="@+id/btnKz"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:minWidth="190dp"
-                        android:minHeight="40dp"
-                        android:layout_margin="2dp"
-                        android:text="@string/Kazakh" />
-                    <Button
-                        android:id="@+id/btnKg"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:minWidth="190dp"
-                        android:minHeight="40dp"
-                        android:layout_margin="2dp"
-                        android:text="@string/Kyrgyz" />
+                        android:layout_marginLeft="2dp"
+                        android:text="@string/Armenia"
+                        android:textSize="12sp" />
                 </TableRow>
 
                 <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-                    <Button
-                        android:id="@+id/btnDr"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
+                    android:layout_marginBottom="4dp"
+                    android:baselineAligned="false">
+                    <androidx.appcompat.widget.AppCompatButton
+                        android:id="@+id/btnEn"
+                        style="@style/MyButtonTheme"
+                        android:layout_width="0dp"
+                        android:layout_height="45dp"
                         android:layout_weight="1"
-                        android:minWidth="190dp"
-                        android:minHeight="40dp"
-                        android:layout_margin="2dp"
-                        android:text="@string/Afghan" />
-                    <Button
-                        android:id="@+id/btnRu"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_marginRight="2dp"
+                        android:text="@string/English"
+                        android:textSize="12sp" />
+                    <androidx.appcompat.widget.AppCompatButton
+                        android:id="@+id/btnGr"
+                        style="@style/MyButtonTheme"
+                        android:layout_width="0dp"
+                        android:layout_height="45dp"
                         android:layout_weight="1"
-                        android:minWidth="190dp"
-                        android:minHeight="40dp"
-                        android:layout_margin="2dp"
-                        android:text="@string/Russian" />
+                        android:layout_marginLeft="2dp"
+                        android:text="@string/Georgian"
+                        android:textSize="12sp" />
                 </TableRow>
+
                 <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-                    <Button
+                    android:layout_marginBottom="4dp"
+                    android:baselineAligned="false">
+                    <androidx.appcompat.widget.AppCompatButton
+                        android:id="@+id/btnKz"
+                        style="@style/MyButtonTheme"
+                        android:layout_width="0dp"
+                        android:layout_height="45dp"
+                        android:layout_weight="1"
+                        android:layout_marginRight="2dp"
+                        android:text="@string/Kazakh"
+                        android:textSize="12sp" />
+                    <androidx.appcompat.widget.AppCompatButton
+                        android:id="@+id/btnKg"
+                        style="@style/MyButtonTheme"
+                        android:layout_width="0dp"
+                        android:layout_height="45dp"
+                        android:layout_weight="1"
+                        android:layout_marginLeft="2dp"
+                        android:text="@string/Kyrgyz"
+                        android:textSize="12sp" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_marginBottom="4dp"
+                    android:baselineAligned="false">
+                    <androidx.appcompat.widget.AppCompatButton
+                        android:id="@+id/btnDr"
+                        style="@style/MyButtonTheme"
+                        android:layout_width="0dp"
+                        android:layout_height="45dp"
+                        android:layout_weight="1"
+                        android:layout_marginRight="2dp"
+                        android:text="@string/Afghan"
+                        android:textSize="12sp" />
+                    <androidx.appcompat.widget.AppCompatButton
+                        android:id="@+id/btnRu"
+                        style="@style/MyButtonTheme"
+                        android:layout_width="0dp"
+                        android:layout_height="45dp"
+                        android:layout_weight="1"
+                        android:layout_marginLeft="2dp"
+                        android:text="@string/Russian"
+                        android:textSize="12sp" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_marginBottom="4dp"
+                    android:baselineAligned="false">
+                    <androidx.appcompat.widget.AppCompatButton
                         android:id="@+id/btnTj"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        style="@style/MyButtonTheme"
+                        android:layout_width="0dp"
+                        android:layout_height="45dp"
                         android:layout_weight="1"
-                        android:minWidth="190dp"
-                        android:minHeight="40dp"
-                        android:layout_margin="2dp"
-                        android:text="@string/Tajik" />
-                    <Button
+                        android:layout_marginRight="2dp"
+                        android:text="@string/Tajik"
+                        android:textSize="12sp" />
+                    <androidx.appcompat.widget.AppCompatButton
                         android:id="@+id/btnTm"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        style="@style/MyButtonTheme"
+                        android:layout_width="0dp"
+                        android:layout_height="45dp"
                         android:layout_weight="1"
-                        android:minWidth="190dp"
-                        android:minHeight="40dp"
-                        android:layout_margin="2dp"
-                        android:text="@string/Turkman" />
+                        android:layout_marginLeft="2dp"
+                        android:text="@string/Turkman"
+                        android:textSize="12sp" />
                 </TableRow>
             </TableLayout>
 
-            <LinearLayout
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btnUz"
+                style="@style/MyButtonTheme"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="0.05"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/btnUz"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:minWidth="190dp"
-                    android:minHeight="40dp"
-                    android:layout_margin="2dp"
-                    android:text="@string/Uzbek" />
-
-            </LinearLayout>
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:minHeight="10dp"
-                android:minWidth="10dp" />
+                android:layout_height="45dp"
+                android:layout_marginTop="2dp"
+                android:text="@string/Uzbek"
+                android:textSize="12sp" />
 
             <CheckBox
                 android:id="@+id/cbIdentifyCountryRegion"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
                 android:text="@string/Identify_country_region" />
+
             <CheckBox
                 android:id="@+id/cbOrderByDistance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/Sort_lists_by_distance" />
 
-            <LinearLayout
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btnQR"
+                style="@style/MyButtonTheme"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="0.05"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/btnQR"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:minWidth="190dp"
-                    android:minHeight="40dp"
-                    android:layout_margin="2dp"
-                    android:text="@string/Authorize_the_tablet_by_QR_code" />
-
-            </LinearLayout>
+                android:layout_height="45dp"
+                android:layout_marginTop="15dp"
+                android:text="@string/Authorize_the_tablet_by_QR_code" />
 
             <CheckBox
                 android:id="@+id/cbShowAdvancedSettings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/Show_advanced_settings"/>
+                android:layout_marginTop="10dp"
+                android:text="@string/Show_advanced_settings" />
 
             <LinearLayout
                 android:id="@+id/llShowAdvancedSettings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="gone">
 
-                <LinearLayout
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/URL_path_to_the_server"
+                    android:textColor="#888888" />
+
+                <EditText
+                    android:id="@+id/edtURL"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/URL_path_to_the_server"
-                        android:textAppearance="?android:attr/textAppearanceSmall"/>
-                </LinearLayout>
+                    android:layout_height="wrap_content"
+                    android:hint="@string/URL_path_to_the_server"
+                    android:textSize="14sp" />
 
-                <LinearLayout
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/Days_of_synchronization"
+                    android:textColor="#888888" />
+
+                <EditText
+                    android:id="@+id/edtSyncDays"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:hint="@string/Days_of_synchronization"
+                    android:inputType="number"
+                    android:textSize="14sp" />
 
-                    <EditText
-                        android:id="@+id/edtURL"
-                        android:hint="@string/URL_path_to_the_server"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:autofillHints=""
-                        android:ems="10"
-                        android:importantForAutofill="no"
-                        android:inputType="textUri" />
-                </LinearLayout>
-
-                <LinearLayout
+                <androidx.appcompat.widget.AppCompatButton
+                    android:id="@+id/btnDeleteAllData"
+                    style="@style/ButtonPinkTheme"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/Days_of_synchronization"
-                        android:textAppearance="?android:attr/textAppearanceSmall"/>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <EditText
-                        android:id="@+id/edtSyncDays"
-                        android:hint="@string/Days_of_synchronization"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:autofillHints=""
-                        android:ems="10"
-                        android:importantForAutofill="no"
-                        android:inputType="number" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.05"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/btnDeleteAllData"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="2dp"
-                        android:minWidth="190dp"
-                        android:minHeight="40dp"
-                        android:text="@string/Delete_all_data" />
-
-                </LinearLayout>
+                    android:layout_height="45dp"
+                    android:layout_marginTop="15dp"
+                    android:text="@string/Delete_all_data" />
             </LinearLayout>
 
         </LinearLayout>
     </ScrollView>
-
 </RelativeLayout>
\ 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 @@
     </style>
 
     <style name="MyButtonTheme" parent="@android:style/Widget.Button">
+        <item name="backgroundTint">@null</item>
         <item name="android:background">@drawable/button_blue</item>
         <item name="android:textColor">@color/White</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="ButtonPinkTheme" parent="@android:style/Widget.Button">
+        <item name="backgroundTint">@null</item>
         <item name="android:background">@drawable/button_pink</item>
         <item name="android:textColor">@color/White</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="MyImageButtonTheme" parent="@android:style/Widget.ImageButton">
+        <item name="backgroundTint">@null</item>
         <item name="android:background">@drawable/button_blue</item>
         <item name="android:textColor">@color/White</item>
         <item name="android:textStyle">bold</item>

From f51351f291ce837c2ffb9ea9c94a6abac548e743 Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Sun, 5 Apr 2026 14:29:24 +0500
Subject: [PATCH 4/4] Set resources in one file

---
 app/build.gradle | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cce34ba..b7da19c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
+
+    bundle {
+        language {
+            enableSplit = false
+        }
+    }
+
     signingConfigs {
         config {
             keyAlias 'ASDC'
@@ -13,8 +20,8 @@ android {
     defaultConfig {
         applicationId "kz.istt.locust"
         minSdkVersion 15
-        versionCode 114
-        versionName "3.0.10"
+        versionCode 115
+        versionName "3.0.11"
         targetSdkVersion 35
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true