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

Compare commits

base: igor:00e1d2293e16d9a7e688f231ca9a094c4eb88fba
Branches Tags
igor:main igor:develop
...
compare: igor:develop
Branches Tags
igor:develop igor:main

17 Commits
00e1d2293e ... develop

Author SHA1 Message Date
igor
f51351f291 Set resources in one file 2026-04-05 14:29:24 +05:00
igor
6ea173b423 New style 2026-04-04 20:45:17 +05:00
igor
410ad1139a gitignore 2026-04-04 20:30:19 +05:00
igor
957e06833f Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop 2026-04-04 14:49:41 +05:00
igor
bfef557d60 Версия 2026-04-04 14:49:30 +05:00
igor
2c355d1898 Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop 2026-04-04 14:26:12 +05:00
igor
d1b23716c3 settings 2026-04-04 14:25:53 +05:00
igor
0c816b4870 Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop 
# Conflicts:
#	.idea/caches/deviceStreaming.xml
 2026-04-04 14:17:38 +05:00
igor
0b9a3c318b Версия другая 2026-04-04 14:15:26 +05:00
Igor I
aef576f893 Activity display style edits 2025-09-05 12:03:27 +05:00
Igor_i
5dfe30948b Merge pull request 'In the field "Type of assessed biological impact" allows multiple selection' (#7) from master into develop 
Reviewed-on: #7
 2025-09-04 13:07:24 +05:00
Igor I
78c688a006 In the field "Type of assessed biological impact" allows multiple selection 2025-09-04 13:05:15 +05:00
Igor I
c935e299bc Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop 2025-09-04 10:31:32 +05:00
Igor I
e916f1012b config 2025-09-04 10:31:23 +05:00
Igor_i
0b52b1c995 Merge pull request 'Multi select eff impect (prepare)' (#6) from develop into master 
Reviewed-on: #6
 2025-09-02 12:29:18 +05:00
Igor_i
dd9adf335e Merge pull request 'develop' (#4) from develop into master 
Reviewed-on: https://git.dirt.kz/igor/org.ccalm.asdc/pulls/4
 2025-04-10 15:42:11 +06:00
Ivanov Igor
9ee46b8f86 Merge pull request '+help' (#3) from develop into master 
Reviewed-on: https://git.dirt.kz/igor/org.ccalm.asdc/pulls/3
 2025-02-27 14:26:07 +06:00
20 changed files with 936 additions and 335 deletions
Expand all files Collapse all files

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

699
.idea/caches/deviceStreaming.xml generated
View File

@ -51,18 +51,6 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2412" /> <option name="screenY" value="2412" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="OnePlus" />
<option name="codename" value="OP5552L1" />
<option name="id" value="OP5552L1" />
<option name="labId" value="google" />
<option name="manufacturer" value="OnePlus" />
<option name="name" value="CPH2415" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2412" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="OPPO" /> <option name="brand" value="OPPO" />
@ -75,6 +63,18 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2400" /> <option name="screenY" value="2400" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="SC-53C" />
<option name="id" value="SC-53C" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A53 5G" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="28" /> <option name="api" value="28" />
<option name="brand" value="DOCOMO" /> <option name="brand" value="DOCOMO" />
@ -100,6 +100,54 @@
<option name="screenX" value="1200" /> <option name="screenX" value="1200" />
<option name="screenY" value="1920" /> <option name="screenY" value="1920" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="a03su" />
<option name="id" value="a03su" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A03s" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="a05s" />
<option name="id" value="a05s" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="A05s" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="a06" />
<option name="id" value="a06" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A06" />
<option name="screenDensity" value="300" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="a13" />
<option name="id" value="a13" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A13" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2408" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
@ -112,6 +160,30 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2408" /> <option name="screenY" value="2408" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="a14xmsq" />
<option name="id" value="a14xmsq" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A14 5G" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2408" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="a14xmtfn" />
<option name="id" value="a14xmtfn" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A14 5G" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2408" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
@ -136,6 +208,42 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2340" /> <option name="screenY" value="2340" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="a15x" />
<option name="id" value="a15x" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="A15 5G" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="a15xtfn" />
<option name="id" value="a15xtfn" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A15 5G" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="a16" />
<option name="id" value="a16" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-A165M" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
@ -148,6 +256,66 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2340" /> <option name="screenY" value="2340" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="a16x" />
<option name="id" value="a16x" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="A16 5G" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="a16xeea" />
<option name="id" value="a16xeea" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="A16 5G" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="31" />
<option name="brand" value="samsung" />
<option name="codename" value="a21" />
<option name="id" value="a21" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A21" />
<option name="screenDensity" value="300" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="a26x" />
<option name="id" value="a26x" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-A266B" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="a34x" />
<option name="id" value="a34x" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-A346N" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
@ -160,6 +328,66 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2340" /> <option name="screenY" value="2340" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="a35x" />
<option name="id" value="a35x" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="A35" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="a35x" />
<option name="id" value="a35x" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="A35" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="a36xq" />
<option name="id" value="a36xq" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-A366E" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="a36xq" />
<option name="id" value="a36xq" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-A366E" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="a56x" />
<option name="id" value="a56x" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-A566E" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="google" /> <option name="brand" value="google" />
@ -196,6 +424,18 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="1272" /> <option name="screenY" value="1272" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="motorola" />
<option name="codename" value="aruba" />
<option name="id" value="aruba" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="moto e20" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="33" /> <option name="api" value="33" />
<option name="brand" value="motorola" /> <option name="brand" value="motorola" />
@ -220,6 +460,30 @@
<option name="screenX" value="1440" /> <option name="screenX" value="1440" />
<option name="screenY" value="3088" /> <option name="screenY" value="3088" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="b0q" />
<option name="id" value="b0q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S22 Ultra" />
<option name="screenDensity" value="600" />
<option name="screenX" value="1440" />
<option name="screenY" value="3088" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="b5qsqw" />
<option name="id" value="b5qsqw" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Z Flip 5" />
<option name="screenDensity" value="340" />
<option name="screenX" value="748" />
<option name="screenY" value="720" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
@ -227,11 +491,23 @@
<option name="id" value="b6q" /> <option name="id" value="b6q" />
<option name="labId" value="google" /> <option name="labId" value="google" />
<option name="manufacturer" value="Samsung" /> <option name="manufacturer" value="Samsung" />
<option name="name" value="Flip 6" /> <option name="name" value="Galaxy Z Flip 6" />
<option name="screenDensity" value="340" /> <option name="screenDensity" value="340" />
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2640" /> <option name="screenY" value="2640" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="b6qsqw" />
<option name="id" value="b6qsqw" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Z Flip 6" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2640" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="36" /> <option name="api" value="36" />
<option name="brand" value="google" /> <option name="brand" value="google" />
@ -256,6 +532,18 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2400" /> <option name="screenY" value="2400" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="c1q" />
<option name="id" value="c1q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Note 20 5G" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="google" /> <option name="brand" value="google" />
@ -292,6 +580,11 @@
<option name="screenDensity" value="390" /> <option name="screenDensity" value="390" />
<option name="screenX" value="2076" /> <option name="screenX" value="2076" />
<option name="screenY" value="2152" /> <option name="screenY" value="2152" />
<option name="tags">
<list>
<option value="dda-default" />
</list>
</option>
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="35" /> <option name="api" value="35" />
@ -305,18 +598,59 @@
<option name="screenDensity" value="390" /> <option name="screenDensity" value="390" />
<option name="screenX" value="2076" /> <option name="screenX" value="2076" />
<option name="screenY" value="2152" /> <option name="screenY" value="2152" />
<option name="tags">
<list>
<option value="dda-default" />
</list>
</option>
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="29" /> <option name="api" value="35" />
<option name="brand" value="motorola" />
<option name="codename" value="cuscoi" />
<option name="id" value="cuscoi" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="edge 50 fusion" />
<option name="screenDensity" value="400" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
<option name="codename" value="crownqlteue" /> <option name="codename" value="dm1q" />
<option name="id" value="crownqlteue" /> <option name="id" value="dm1q" />
<option name="labId" value="google" /> <option name="labId" value="google" />
<option name="manufacturer" value="Samsung" /> <option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Note9" /> <option name="name" value="S23" />
<option name="screenDensity" value="420" /> <option name="screenDensity" value="480" />
<option name="screenX" value="2220" /> <option name="screenX" value="1080" />
<option name="screenY" value="1080" /> <option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="dm1q-SM-S911U" />
<option name="id" value="dm1q-SM-S911U" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="S23" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="dm1qcsx" />
<option name="id" value="dm1qcsx" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S23" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
@ -366,6 +700,53 @@
<option name="screenDensity" value="480" /> <option name="screenDensity" value="480" />
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2340" /> <option name="screenY" value="2340" />
<option name="tags">
<list>
<option value="dda-default" />
</list>
</option>
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="e1q" />
<option name="default" value="true" />
<option name="id" value="e1q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
<option name="tags">
<list>
<option value="dda-default" />
</list>
</option>
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="e2q" />
<option name="id" value="e2q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24 +" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="e2s" />
<option name="id" value="e2s" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24+" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
@ -379,6 +760,42 @@
<option name="screenX" value="1440" /> <option name="screenX" value="1440" />
<option name="screenY" value="3120" /> <option name="screenY" value="3120" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="e3q" />
<option name="id" value="e3q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24 Ultra" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1440" />
<option name="screenY" value="3120" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="e3qcsx" />
<option name="id" value="e3qcsx" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24 Ultra" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1440" />
<option name="screenY" value="3120" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="e3qksx" />
<option name="id" value="e3qksx" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24 Ultra" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1440" />
<option name="screenY" value="3120" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="33" /> <option name="api" value="33" />
<option name="brand" value="google" /> <option name="brand" value="google" />
@ -439,6 +856,18 @@
<option name="screenX" value="720" /> <option name="screenX" value="720" />
<option name="screenY" value="1600" /> <option name="screenY" value="1600" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="motorola" />
<option name="codename" value="fogorow" />
<option name="id" value="fogorow" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="moto g24" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1612" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="motorola" /> <option name="brand" value="motorola" />
@ -475,6 +904,30 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2340" /> <option name="screenY" value="2340" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="g0q" />
<option name="id" value="g0q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-S906U1" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="motorola" />
<option name="codename" value="gnevan" />
<option name="id" value="gnevan" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="moto g stylus (2023)" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
@ -573,6 +1026,18 @@
<option name="screenX" value="1008" /> <option name="screenX" value="1008" />
<option name="screenY" value="2244" /> <option name="screenY" value="2244" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="google" />
<option name="codename" value="husky" />
<option name="id" value="husky" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8 Pro" />
<option name="screenDensity" value="390" />
<option name="screenX" value="1008" />
<option name="screenY" value="2244" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="30" /> <option name="api" value="30" />
<option name="brand" value="motorola" /> <option name="brand" value="motorola" />
@ -621,6 +1086,18 @@
<option name="screenX" value="1008" /> <option name="screenX" value="1008" />
<option name="screenY" value="2244" /> <option name="screenY" value="2244" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="motorola" />
<option name="codename" value="lamul" />
<option name="id" value="lamul" />
<option name="labId" value="google" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="moto g05" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1604" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="motorola" /> <option name="brand" value="motorola" />
@ -705,6 +1182,18 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2400" /> <option name="screenY" value="2400" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="o1q" />
<option name="id" value="o1q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S21" />
<option name="screenDensity" value="421" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="31" /> <option name="api" value="31" />
<option name="brand" value="google" /> <option name="brand" value="google" />
@ -717,6 +1206,42 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2400" /> <option name="screenY" value="2400" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="p3q" />
<option name="id" value="p3q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S21 Ultra" />
<option name="screenDensity" value="600" />
<option name="screenX" value="1440" />
<option name="screenY" value="3200" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="pa2q" />
<option name="id" value="pa2q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="S25+" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="pa2qxxx" />
<option name="id" value="pa2qxxx" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S25+" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="35" /> <option name="api" value="35" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
@ -725,9 +1250,21 @@
<option name="labId" value="google" /> <option name="labId" value="google" />
<option name="manufacturer" value="Samsung" /> <option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S25 Ultra" /> <option name="name" value="Galaxy S25 Ultra" />
<option name="screenDensity" value="600" /> <option name="screenDensity" value="450" />
<option name="screenX" value="1440" /> <option name="screenX" value="1080" />
<option name="screenY" value="3120" /> <option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="pa3q" />
<option name="id" value="pa3q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S25 Ultra" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="33" /> <option name="api" value="33" />
@ -741,6 +1278,18 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2400" /> <option name="screenY" value="2400" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="psq" />
<option name="id" value="psq" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S25 Edge" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1440" />
<option name="screenY" value="3120" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
@ -765,6 +1314,18 @@
<option name="screenX" value="1856" /> <option name="screenX" value="1856" />
<option name="screenY" value="2160" /> <option name="screenY" value="2160" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="r0qcsx" />
<option name="id" value="r0qcsx" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="S22" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="30" /> <option name="api" value="30" />
<option name="brand" value="google" /> <option name="brand" value="google" />
@ -791,6 +1352,54 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2340" /> <option name="screenY" value="2340" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="r11s" />
<option name="id" value="r11s" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-S711N" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="r8q" />
<option name="id" value="r8q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S20 FE 5G" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="r9q" />
<option name="id" value="r9q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S21 FE 5G" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="samsung" />
<option name="codename" value="r9q-SM-G990U" />
<option name="id" value="r9q-SM-G990U" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S21 FE 5G" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="36" /> <option name="api" value="36" />
<option name="brand" value="google" /> <option name="brand" value="google" />
@ -814,6 +1423,11 @@
<option name="screenDensity" value="440" /> <option name="screenDensity" value="440" />
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2340" /> <option name="screenY" value="2340" />
<option name="tags">
<list>
<option value="default" />
</list>
</option>
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
@ -839,6 +1453,18 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2400" /> <option name="screenY" value="2400" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="t2q" />
<option name="id" value="t2q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S21 Plus" />
<option name="screenDensity" value="394" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="33" /> <option name="api" value="33" />
<option name="brand" value="google" /> <option name="brand" value="google" />
@ -876,6 +1502,11 @@
<option name="screenDensity" value="420" /> <option name="screenDensity" value="420" />
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2424" /> <option name="screenY" value="2424" />
<option name="tags">
<list>
<option value="dda-default" />
</list>
</option>
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="35" /> <option name="api" value="35" />
@ -889,6 +1520,11 @@
<option name="screenDensity" value="420" /> <option name="screenDensity" value="420" />
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2424" /> <option name="screenY" value="2424" />
<option name="tags">
<list>
<option value="dda-default" />
</list>
</option>
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="36" /> <option name="api" value="36" />
@ -902,6 +1538,11 @@
<option name="screenDensity" value="420" /> <option name="screenDensity" value="420" />
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2424" /> <option name="screenY" value="2424" />
<option name="tags">
<list>
<option value="dda-default" />
</list>
</option>
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="34" /> <option name="api" value="34" />
@ -915,6 +1556,18 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2408" /> <option name="screenY" value="2408" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="y2q" />
<option name="id" value="y2q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="S20 Plus 5G" />
<option name="screenDensity" value="600" />
<option name="screenX" value="1440" />
<option name="screenY" value="3200" />
</PersistentDeviceSelectionData>
</list> </list>
</option> </option>
</component> </component>

17
app/build.gradle
View File

@ -1,11 +1,18 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
bundle {
language {
enableSplit = false
}
}
signingConfigs { signingConfigs {
config { config {
keyAlias 'ASDC' keyAlias 'ASDC'
keyPassword 'firstg@h0km' keyPassword 'firstg@h0km'
storeFile file('/mnt/O_DRIVE/projects/Workspace_Android/Keystore/locustkeystore') storeFile file('O:/projects/Workspace_Android/Keystore/locustkeystore')
storePassword 'locustg@h0km' storePassword 'locustg@h0km'
} }
} }
@ -13,9 +20,9 @@ android {
defaultConfig { defaultConfig {
applicationId "kz.istt.locust" applicationId "kz.istt.locust"
minSdkVersion 15 minSdkVersion 15
versionCode 110 versionCode 115
versionName "3.0.7" versionName "3.0.11"
targetSdkVersion 34 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 {

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

@ -7,6 +7,7 @@
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:fitsSystemWindows="true"
android:screenOrientation="portrait" android:screenOrientation="portrait"
tools:context=".LocustActivity"> 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:paddingBottom="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustDelActivity"> tools:context=".LocustDelActivity">
<ScrollView <ScrollView

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

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

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

@ -7,6 +7,7 @@
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
android:screenOrientation="portrait" android:screenOrientation="portrait"
tools:context=".LocustActivity"> 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:paddingBottom="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustDelActivity"> tools:context=".LocustDelActivity">
<ScrollView <ScrollView

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

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

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

@ -6,6 +6,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
android:background="@drawable/gradient_example" android:background="@drawable/gradient_example"
tools:context=".ImagePickActivity" > 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:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
android:screenOrientation="portrait" android:screenOrientation="portrait"
tools:context=".LocustActivity"> 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:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:fitsSystemWindows="true"
tools:context=".LocustDelActivity"> tools:context=".LocustDelActivity">
<ScrollView <ScrollView
@ -2524,6 +2525,9 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</RelativeLayout> </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:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustDelListActivity" > tools:context=".LocustDelListActivity" >
<LinearLayout <LinearLayout

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

@ -6,6 +6,7 @@
android:background="@drawable/gradient_example" android:background="@drawable/gradient_example"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustHealthActivity"> tools:context=".LocustHealthActivity">
<ScrollView <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:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context=".LocustHealthListActivity" > tools:context=".LocustHealthListActivity" >
<LinearLayout <LinearLayout

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

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

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

@ -1,96 +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: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"/>
@ -98,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"/>
@ -109,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"/>
@ -120,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"
@ -157,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"
@ -185,4 +160,5 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

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

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

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

@ -1,313 +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: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>

3
app/src/main/res/values/styles.xml
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>