Compare commits

...

7 Commits

Author SHA1 Message Date
f51351f291 Set resources in one file 2026-04-05 14:29:24 +05:00
6ea173b423 New style 2026-04-04 20:45:17 +05:00
410ad1139a gitignore 2026-04-04 20:30:19 +05:00
957e06833f Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop 2026-04-04 14:49:41 +05:00
bfef557d60 Версия 2026-04-04 14:49:30 +05:00
2c355d1898 Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop 2026-04-04 14:26:12 +05:00
d1b23716c3 settings 2026-04-04 14:25:53 +05:00
5 changed files with 241 additions and 312 deletions

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
*.iml *.iml
.gradle .gradle
/app
/local.properties /local.properties
/.idea/libraries /.idea/libraries
/.idea/modules.xml /.idea/modules.xml

View File

@ -1,6 +1,13 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
bundle {
language {
enableSplit = false
}
}
signingConfigs { signingConfigs {
config { config {
keyAlias 'ASDC' keyAlias 'ASDC'
@ -13,8 +20,8 @@ android {
defaultConfig { defaultConfig {
applicationId "kz.istt.locust" applicationId "kz.istt.locust"
minSdkVersion 15 minSdkVersion 15
versionCode 113 versionCode 115
versionName "3.0.9" versionName "3.0.11"
targetSdkVersion 35 targetSdkVersion 35
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
@ -39,7 +46,7 @@ android {
targetCompatibility JavaVersion.VERSION_21 targetCompatibility JavaVersion.VERSION_21
} }
namespace 'kz.istt.locust' namespace 'kz.istt.locust'
compileSdk 34 compileSdk 35
} }
dependencies { dependencies {

View File

@ -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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="10dp" android:padding="10dp"
android:fitsSystemWindows="true"
android:background="@drawable/gradient_example" android:background="@drawable/gradient_example"
tools:context=".MainActivity" > tools:context=".MainActivity">
<!-- Progress Block -->
<LinearLayout <LinearLayout
android:id="@+id/pBar" android:id="@+id/pBar"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:orientation="vertical"
android:layout_centerVertical="true" android:visibility="gone"
android:gravity="center"
android:orientation="vertical"> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
<Space app:layout_constraintStart_toStartOf="parent"
android:layout_width="match_parent" app:layout_constraintEnd_toEndOf="parent">
android:layout_height="match_parent"
android:layout_weight="1"/>
<TextView <TextView
android:id="@+id/tvProgressInfo" android:id="@+id/tvProgressInfo"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:gravity="center" android:gravity="center"
android:text="Synchronize directories through the Internet!" android:text="Synchronize directories through the Internet!"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceMedium"/> android:textAppearance="?android:attr/textAppearanceMedium"/>
<ProgressBar <ProgressBar
android:id="@+id/progress" android:id="@+id/progress"
style="?android:attr/progressBarStyleLarge" style="?android:attr/progressBarStyleLarge"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"/> android:layout_marginBottom="8dp"/>
<TextView <TextView
android:id="@+id/tvCountTasks" android:id="@+id/tvCountTasks"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:gravity="center" android:gravity="center"
android:text="@string/action_synchronize" android:text="@string/action_synchronize"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceMedium"/> android:textAppearance="?android:attr/textAppearanceMedium"/>
<Space
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"/>
</LinearLayout> </LinearLayout>
<!-- Main Form -->
<LinearLayout <LinearLayout
android:id="@+id/form" android:id="@+id/form"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="0dp"
android:layout_centerHorizontal="true" android:orientation="vertical"
android:layout_centerVertical="true" android:gravity="center_horizontal|center_vertical"
android:visibility="gone" app:layout_constraintTop_toTopOf="parent"
android:orientation="vertical"> app:layout_constraintBottom_toTopOf="@id/footerBlock"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<TextView <TextView
android:id="@+id/textView1" android:id="@+id/textView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:gravity="center" android:gravity="center"
android:text="@string/Fields_marked_are_mandatory" android:text="@string/Fields_marked_are_mandatory"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceMedium"/> android:textAppearance="?android:attr/textAppearanceMedium"/>
<Space
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"/>
<Button <Button
android:id="@+id/btnLocust" android:id="@+id/btnLocust"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_marginHorizontal="62dp"
android:layout_marginLeft="62dp" android:layout_marginTop="32dp"
android:layout_marginRight="62dp"
android:minHeight="70dp" android:minHeight="70dp"
android:text="@string/title_activity_locust"/> android:text="@string/title_activity_locust"/>
@ -99,10 +82,8 @@
android:id="@+id/btnLocustDel" android:id="@+id/btnLocustDel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_marginHorizontal="62dp"
android:layout_marginTop="52dp" android:layout_marginTop="24dp"
android:layout_marginLeft="62dp"
android:layout_marginRight="62dp"
android:minHeight="70dp" android:minHeight="70dp"
android:text="@string/title_activity_locust_del"/> android:text="@string/title_activity_locust_del"/>
@ -110,10 +91,8 @@
android:id="@+id/btnLocustHealth" android:id="@+id/btnLocustHealth"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_marginHorizontal="62dp"
android:layout_marginTop="52dp" android:layout_marginTop="24dp"
android:layout_marginLeft="62dp"
android:layout_marginRight="62dp"
android:minHeight="70dp" android:minHeight="70dp"
android:text="@string/Human_Health_and_Environment_HH_Env_Monitoring_Form"/> android:text="@string/Human_Health_and_Environment_HH_Env_Monitoring_Form"/>
@ -121,28 +100,29 @@
android:id="@+id/btnSetup" android:id="@+id/btnSetup"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="52dp" android:layout_marginHorizontal="62dp"
android:layout_marginLeft="62dp" android:layout_marginTop="24dp"
android:layout_marginRight="62dp"
android:minHeight="70dp" android:minHeight="70dp"
android:text="@string/title_activity_setup"/> android:text="@string/title_activity_setup"/>
<Space </LinearLayout>
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"/>
<!-- 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 <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_marginBottom="16dp"
android:layout_alignRight="@+id/textView1" android:gravity="end">
android:layout_marginBottom="46dp">
<Space
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"/>
<TextView <TextView
android:id="@+id/tvV" android:id="@+id/tvV"
@ -158,18 +138,12 @@
android:textAppearance="?android:attr/textAppearanceMedium"/> android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout> </LinearLayout>
<!-- App ID -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignLeft="@+id/textView1" android:gravity="end"
android:layout_alignParentBottom="true" android:paddingBottom="48dp">
android:layout_alignRight="@+id/textView1"
android:layout_marginBottom="16dp">
<Space
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"/>
<TextView <TextView
android:id="@+id/tvID" android:id="@+id/tvID"
@ -186,4 +160,5 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -1,314 +1,257 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/gradient_example" android:background="#FFFAB0">
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" >
<ScrollView <ScrollView
android:id="@+id/scrollView1" android:id="@+id/mainScrollView"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentBottom="true" android:clipToPadding="false"
android:layout_alignParentLeft="true" android:padding="12dp"
android:layout_alignParentRight="true" android:paddingTop="40dp">
android:layout_alignParentTop="true" >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignLeft="@+id/scrollView1" android:orientation="vertical">
android:layout_below="@+id/scrollView1"
android:orientation="vertical" >
<LinearLayout <LinearLayout
android:layout_width="match_parent" 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" android:id="@+id/btnSynchronization"
style="@style/MyButtonTheme"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="40dp"
android:layout_margin="10dp" android:paddingLeft="10dp"
android:minHeight="40dp" android:paddingRight="10dp"
android:minWidth="120dp"
android:text="@string/action_synchronize" /> android:text="@string/action_synchronize" />
<TextView <TextView
android:id="@+id/tvSynchronization" android:id="@+id/tvSynchronization"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="@string/action_synchronize" android:text="@string/action_synchronize"
android:textAppearance="?android:attr/textAppearanceMedium"/> android:textSize="16sp" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/textView1" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" 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:text="@string/To_change_the_language_you_need_to_restart_the_application"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textColor="#666666" />
<TableLayout <TableLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content"
android:stretchColumns="0,1">
<TableRow <TableRow
android:layout_width="match_parent" android:layout_marginBottom="4dp"
android:layout_height="match_parent"> android:baselineAligned="false">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnAz" android:id="@+id/btnAz"
android:layout_width="match_parent" style="@style/MyButtonTheme"
android:layout_height="match_parent" android:layout_width="0dp"
android:layout_height="45dp"
android:layout_weight="1" android:layout_weight="1"
android:minWidth="190dp" android:layout_marginRight="2dp"
android:minHeight="40dp" android:text="@string/Azerbaijani"
android:layout_margin="2dp" android:textSize="12sp" />
android:text="@string/Azerbaijani" /> <androidx.appcompat.widget.AppCompatButton
<Button
android:id="@+id/btnAr" android:id="@+id/btnAr"
android:layout_width="match_parent" style="@style/MyButtonTheme"
android:layout_height="match_parent" android:layout_width="0dp"
android:layout_height="45dp"
android:layout_weight="1" android:layout_weight="1"
android:minWidth="190dp" android:layout_marginLeft="2dp"
android:minHeight="40dp" android:text="@string/Armenia"
android:layout_margin="2dp" android:textSize="12sp" />
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" />
</TableRow> </TableRow>
<TableRow <TableRow
android:layout_width="match_parent" android:layout_marginBottom="4dp"
android:layout_height="match_parent"> android:baselineAligned="false">
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnDr" android:id="@+id/btnEn"
android:layout_width="wrap_content" style="@style/MyButtonTheme"
android:layout_height="match_parent" android:layout_width="0dp"
android:layout_height="45dp"
android:layout_weight="1" android:layout_weight="1"
android:minWidth="190dp" android:layout_marginRight="2dp"
android:minHeight="40dp" android:text="@string/English"
android:layout_margin="2dp" android:textSize="12sp" />
android:text="@string/Afghan" /> <androidx.appcompat.widget.AppCompatButton
<Button android:id="@+id/btnGr"
android:id="@+id/btnRu" style="@style/MyButtonTheme"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="45dp"
android:layout_weight="1" android:layout_weight="1"
android:minWidth="190dp" android:layout_marginLeft="2dp"
android:minHeight="40dp" android:text="@string/Georgian"
android:layout_margin="2dp" android:textSize="12sp" />
android:text="@string/Russian" />
</TableRow> </TableRow>
<TableRow <TableRow
android:layout_width="match_parent" android:layout_marginBottom="4dp"
android:layout_height="match_parent"> android:baselineAligned="false">
<Button <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:id="@+id/btnTj"
android:layout_width="match_parent" style="@style/MyButtonTheme"
android:layout_height="match_parent" android:layout_width="0dp"
android:layout_height="45dp"
android:layout_weight="1" android:layout_weight="1"
android:minWidth="190dp" android:layout_marginRight="2dp"
android:minHeight="40dp" android:text="@string/Tajik"
android:layout_margin="2dp" android:textSize="12sp" />
android:text="@string/Tajik" /> <androidx.appcompat.widget.AppCompatButton
<Button
android:id="@+id/btnTm" android:id="@+id/btnTm"
android:layout_width="match_parent" style="@style/MyButtonTheme"
android:layout_height="match_parent" android:layout_width="0dp"
android:layout_height="45dp"
android:layout_weight="1" android:layout_weight="1"
android:minWidth="190dp" android:layout_marginLeft="2dp"
android:minHeight="40dp" android:text="@string/Turkman"
android:layout_margin="2dp" android:textSize="12sp" />
android:text="@string/Turkman" />
</TableRow> </TableRow>
</TableLayout> </TableLayout>
<LinearLayout <androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnUz"
style="@style/MyButtonTheme"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="45dp"
android:layout_weight="0.05" android:layout_marginTop="2dp"
android:orientation="horizontal"> android:text="@string/Uzbek"
android:textSize="12sp" />
<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" />
<CheckBox <CheckBox
android:id="@+id/cbIdentifyCountryRegion" android:id="@+id/cbIdentifyCountryRegion"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/Identify_country_region" /> android:text="@string/Identify_country_region" />
<CheckBox <CheckBox
android:id="@+id/cbOrderByDistance" android:id="@+id/cbOrderByDistance"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/Sort_lists_by_distance" /> 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_width="match_parent"
android:layout_height="match_parent" android:layout_height="45dp"
android:layout_weight="0.05" android:layout_marginTop="15dp"
android:orientation="horizontal"> android:text="@string/Authorize_the_tablet_by_QR_code" />
<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>
<CheckBox <CheckBox
android:id="@+id/cbShowAdvancedSettings" android:id="@+id/cbShowAdvancedSettings"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/Show_advanced_settings"/> android:layout_marginTop="10dp"
android:text="@string/Show_advanced_settings" />
<LinearLayout <LinearLayout
android:id="@+id/llShowAdvancedSettings" android:id="@+id/llShowAdvancedSettings"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
<TextView android:hint="@string/URL_path_to_the_server"
android:layout_width="wrap_content" android:textSize="14sp" />
android:layout_height="wrap_content"
android:text="@string/URL_path_to_the_server"
android:textAppearance="?android:attr/textAppearanceSmall"/>
</LinearLayout>
<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_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 <androidx.appcompat.widget.AppCompatButton
android:id="@+id/edtURL" android:id="@+id/btnDeleteAllData"
android:hint="@string/URL_path_to_the_server" style="@style/ButtonPinkTheme"
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
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="45dp"
<TextView android:layout_marginTop="15dp"
android:layout_width="wrap_content" android:text="@string/Delete_all_data" />
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>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</RelativeLayout> </RelativeLayout>

View File

@ -22,18 +22,21 @@
</style> </style>
<style name="MyButtonTheme" parent="@android:style/Widget.Button"> <style name="MyButtonTheme" parent="@android:style/Widget.Button">
<item name="backgroundTint">@null</item>
<item name="android:background">@drawable/button_blue</item> <item name="android:background">@drawable/button_blue</item>
<item name="android:textColor">@color/White</item> <item name="android:textColor">@color/White</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
</style> </style>
<style name="ButtonPinkTheme" parent="@android:style/Widget.Button"> <style name="ButtonPinkTheme" parent="@android:style/Widget.Button">
<item name="backgroundTint">@null</item>
<item name="android:background">@drawable/button_pink</item> <item name="android:background">@drawable/button_pink</item>
<item name="android:textColor">@color/White</item> <item name="android:textColor">@color/White</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
</style> </style>
<style name="MyImageButtonTheme" parent="@android:style/Widget.ImageButton"> <style name="MyImageButtonTheme" parent="@android:style/Widget.ImageButton">
<item name="backgroundTint">@null</item>
<item name="android:background">@drawable/button_blue</item> <item name="android:background">@drawable/button_blue</item>
<item name="android:textColor">@color/White</item> <item name="android:textColor">@color/White</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>