helcel/beans
2
0 Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 15 Wiki Activity

Compare commits

base: helcel/beans:0.1a-rc3
helcel/beans:main
helcel/beans:1.7 helcel/beans:1.6 helcel/beans:1.5 helcel/beans:1.4 helcel/beans:1.3.1 helcel/beans:1.3b helcel/beans:1.3a helcel/beans:1.3 helcel/beans:1.2b helcel/beans:1.2 helcel/beans:1.1a helcel/beans:1.0c helcel/beans:1.0b helcel/beans:1.0aa helcel/beans:1.0a helcel/beans:1.0-rc1 helcel/beans:0.1a-rc3 helcel/beans:0.1a-rc2 helcel/beans:0.1a-rc1
..
compare: helcel/beans:a3f81c95a08e72f833935e16065ae1bffe96de81
helcel/beans:main
helcel/beans:1.7 helcel/beans:1.6 helcel/beans:1.5 helcel/beans:1.4 helcel/beans:1.3.1 helcel/beans:1.3b helcel/beans:1.3a helcel/beans:1.3 helcel/beans:1.2b helcel/beans:1.2 helcel/beans:1.1a helcel/beans:1.0c helcel/beans:1.0b helcel/beans:1.0aa helcel/beans:1.0a helcel/beans:1.0-rc1 helcel/beans:0.1a-rc3 helcel/beans:0.1a-rc2 helcel/beans:0.1a-rc1
13 Commits
0.1a-rc3 .. a3f81c95a0
Author SHA1 Message Date
fgerber a3f81c95a0 Add Antarctica SVG 2024-04-08 11:36:05 +02:00
fgerber d041df9805 Adapt settings and icons 2024-04-08 11:35:51 +02:00
fgerber 01dab6aa30 Prevent overriding default group 2024-04-08 10:52:08 +02:00
fgerber bafd3cea14 Remove magic group keys 2024-04-08 10:45:16 +02:00
fgerber ec52574ae3 Update checkboxes immediately 2024-04-08 10:42:16 +02:00
soraefir 923404ebc5 Fix regional UI 2024-04-08 00:42:35 +02:00
fgerber 32ba5e0b07 Merge Shetland Islands with Scotland 2024-04-07 23:27:12 +02:00
fgerber 72b2148e4b Change some country names 2024-04-07 22:21:08 +02:00
fgerber 513660b3a4 Reorganize countries in 'Others' group 2024-04-07 22:04:33 +02:00
soraefir 443d62b6df Fixed state names 2024-04-07 11:59:37 +02:00
soraefir a360c7496b Added prerelease to build 2024-04-07 11:25:19 +02:00
soraefir 3fe83cff2e Fix debug build if no key 2024-04-07 11:10:27 +02:00
Renovate Bot 71acf04f20 Lock file maintenance 2024-04-06 00:04:23 +00:00
18 changed files with 2188 additions and 3449 deletions
Expand all files Collapse all files

No files matched your search

.github/workflows/build.yml
+8 -8
View File
@@ -48,17 +48,17 @@ jobs:
cache: 'gradle'
- name: Build APK
run: ./gradlew assemble
# - name: Upload APK
# uses: actions/upload-artifact@v4
# with:
# name: app.apk
# path: app/build/outputs/apk/release/app-release.apk
run: ./gradlew assembleSignedRelease
- name: Release
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
app/build/outputs/apk/release/app-release.apk
app/build/outputs/apk/signedRelease/app-signedRelease.apk
prerelease: |
if [[ ${{ github.ref }} =~ ^refs/tags/[0-9]+\.[0-9]+[a-z]+$ ]]; then
echo "false"
else
echo "true"
fi
app/build.gradle
+16 -4
View File
@@ -5,9 +5,6 @@ plugins {
id 'com.mikepenz.aboutlibraries.plugin' version '11.1.1'
}
def keystorePropertiesFile = rootProject.file("app/keystore.properties")
def keystoreProperties = new Properties()
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
android {
namespace 'net.helcel.beans'
@@ -20,22 +17,37 @@ android {
versionCode 1
versionName "0.1a"
}
signingConfigs {
create("release") {
try {
def keystorePropertiesFile = rootProject.file("app/keystore.properties")
def keystoreProperties = new Properties()
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile file(keystoreProperties['storeFile'])
storePassword keystoreProperties['storePassword']
} catch (FileNotFoundException e) {
println("File not found: ${e.message}")
}
}
}
buildTypes {
debug {
debuggable true
}
release {
minifyEnabled true
shrinkResources false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
signedRelease {
minifyEnabled true
shrinkResources false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
signingConfig = signingConfigs.getByName("release")
}
}
app/src/main/assets/geoloc_state.txt
+3 -4
View File
@@ -1896,7 +1896,7 @@ MAR_FB|MAR|Fès-Boulemane|19366
MAR_GB|MAR|Gharb-Chrarda-Béni Hssen|8782
MAR_GC|MAR|Grand Casablanca|879
MAR_GE|MAR|Guelmim-Es-Semara|64701
MAR_LB|MAR|Laâyoune-Boujdour-Sakia El H|5763
MAR_LB|MAR|Laâyoune-Boujdour-Sakia El Hamra|5763
MAR_MK|MAR|Marrakech-Tensift-Al Haouz|32483
MAR_MT|MAR|Meknès-Tafilalet|60303
MAR_OR|MAR|Oriental|59914
@@ -3293,9 +3293,9 @@ ARE_RK|ARE|Ras Al-Khaimah|2442
ARE_SH|ARE|Sharjah|2529
ARE_UQ|ARE|Ummal-Qaywayn|746
GBR_NIR|GBR|Northern Ireland|14134
GBR_SCT|GBR|Scotland|78704
GBR_SCT|GBR|Scotland|79121
GBR_WLS|GBR|Wales|20818
GBR_NA|GBR|NA|130659
GBR_NA|GBR|England|130659
USA_AL|USA|Alabama|133995
USA_AK|USA|Alaska|1501231
USA_AZ|USA|Arizona|296082
@@ -3532,4 +3532,3 @@ Z05_UT|IND|Uttarakhand|259
Z09_UT|IND|Uttarakhand|987
Z06_JK|PAK|Azad Kashmir|13931
Z06_NA|PAK|Gilgit-Baltistan|68053
GBR_EN|GBR|England|417
app/src/main/assets/mercator01.svg
+6 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="800" height="534" viewBox="0 0 800 534" stroke-linecap="round" stroke-linejoin="round">
<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="800" height="534" viewBox="0 0 800 600" stroke-linecap="round" stroke-linejoin="round">
<g id="AFG1">
<path d="M 555.72 283.54 555.73 283.49 555.73 282.94 555.74 282.94 556.13 282.7 556.21 281.79 555.43 281.48 555.37 281.45 555.21 280.75 555.22 278.39 555.29 278.33 555.75 277.55 555.72 277.52 555.58 277.47 555.56 277.41 555.81 277.13 555.83 277.09 556.67 275.9 557.36 275.67 558.13 276.29 558.2 276.31 557.96 277.27 558.66 277.24 558.7 277.3 558.34 279.69 558.75 280.64 558.78 280.69 559.25 280.73 560.22 279.95 560.28 279.91 560.46 279.86 560.51 279.85 560.73 279.85 560.77 279.85 560.95 279.78 561.01 279.77 561.32 279.3 562.45 278.58 562.56 278.55 563.54 278.62 563.68 279.2 564.82 278.67 564.87 278.68 564.89 278.71 565.98 279.08 566.02 279.22 566.01 279.23 565.84 279.25 565.22 279.66 565.3 279.75 565.3 279.75 565.27 279.96 565.24 279.95 564.1 280.27 563.88 280.18 563.81 280.15 563.6 280.11 563.24 280.11 563.28 280.15 563.27 280.16 563.07 280.16 562.6 280.25 562.53 280.26 562.4 280.23 562.23 280.19 562.01 280.2 561.05 280.26 558.84 281.29 558.14 282.18 558.02 282.25 557.89 282.44 557.9 282.49 557.4 283.48 556.86 284.01 556.25 283.49 555.99 283.41 555.84 283.54 555.79 283.55 555.75 283.55 555.72 283.54 Z" id="AFG_BD" data-gid_0="AFG" data-country="Afghanistan" data-gid="AFG_BD" data-name="Badakhshan"/>
<path d="M 539.25 284.51 539.26 284.51 539.4 284.4 539.42 284.37 539.49 284.31 539.57 284.27 539.89 283.09 541.56 282.61 541.66 282.6 541.66 282.61 541.65 282.63 541.62 282.69 541.67 283.06 541.62 283.33 541.92 283.99 542.11 284 542.26 284.01 542.37 284.01 543.31 284.76 543.46 284.75 544.02 285.11 544.28 285.8 542.89 286.36 542.04 286.32 541.17 286.62 539.87 286.28 538.88 285.63 538.9 285.03 539.21 284.71 539.25 284.51 Z" id="AFG_BG" data-gid_0="AFG" data-country="Afghanistan" data-gid="AFG_BG" data-name="Badghis"/>
@@ -4570,10 +4570,9 @@
</g>
<g id="GBR1">
<path d="M 385.24 220.89 385.24 220.89 385.24 220.89 385.24 220.89 Z M 387.78 222.85 387.77 222.85 387.77 222.84 387.78 222.85 Z M 387.53 224.07 387.52 224.07 387.51 224.06 387.53 224.07 Z M 386.56 225.41 386.42 225.25 386.34 225.25 386.18 225.14 386.08 225.08 386.05 225.06 386.01 224.97 386.02 225.02 386.05 225.07 386.04 225.09 385.84 225.26 385.82 225.27 385.52 225.27 385.48 225.31 385.38 225.33 385.37 225.32 385.26 225.27 385.23 225.25 385.23 225.23 385.23 225.22 385.24 225.18 385.06 224.81 385.05 224.8 384.92 224.69 384.93 224.66 384.78 224.46 384.76 224.43 384.68 224.08 384.66 224.06 384.64 224.07 384.63 224.06 384.53 223.95 384.51 223.95 384.33 224.02 384.3 224.05 384.3 224.06 384.25 224.1 383.8 225.05 383.76 225.05 383.73 225.05 383.72 225.03 383.68 225 383.64 225.03 382.58 224.68 382.39 224.35 381.91 223.82 381.93 223.82 381.9 223.76 381.89 223.74 381.87 223.74 381.87 223.73 381.9 223.72 382.51 223.01 383.41 222.36 383.72 221.49 383.74 221.49 383.84 221.5 383.87 221.47 383.9 221.42 385.62 220.72 385.64 220.71 386.31 220.85 386.41 220.84 386.64 221.06 386.61 221.2 386.62 221.2 386.67 221.46 386.74 221.46 386.78 221.5 387.3 222.27 387.37 222.39 387.38 222.42 387.38 222.49 387.35 222.64 387.31 222.69 387.5 222.92 387.53 222.92 387.54 222.92 387.55 222.93 387.58 222.92 387.59 222.92 387.63 222.93 387.66 222.97 387.69 223.01 387.71 223.02 387.72 223.05 387.85 223.87 387.87 223.91 387.88 223.91 387.89 223.94 387.89 223.96 387.89 223.97 387.89 223.98 387.89 223.98 387.89 223.99 387.89 223.99 387.89 224.01 387.9 224.02 387.89 224.05 387.88 224.05 387.87 224.04 387.84 224.08 387.83 224.1 387.85 224.13 387.84 224.15 387.82 224.16 387.81 224.22 387.8 224.24 387.76 224.21 387.75 224.14 387.47 223.34 387.46 223.33 387.41 223.29 387.38 223.32 387.53 223.85 387.74 224.3 387.72 224.32 387.71 224.33 387.68 224.37 387.58 224.54 387.55 224.57 387.54 224.54 387.52 224.55 387.51 224.57 387.5 224.59 387.48 224.62 387.44 224.64 387.18 224.57 387.09 224.57 387.07 224.52 386.65 225.35 386.56 225.41 Z" fill-rule="evenodd" id="GBR_NIR" data-gid_0="GBR" data-country="UnitedKingdom" data-gid="GBR_NIR" data-name="NorthernIreland"/>
<path d="M 383.9 212.12 383.9 212.13 383.87 212.12 383.85 212.11 383.75 212.09 383.75 212.09 383.75 212.09 383.75 212.09 383.59 211.87 383.57 211.86 383.57 211.86 383.57 211.86 383.56 211.86 383.66 211.77 383.72 211.77 383.73 211.75 383.78 211.76 383.84 211.79 384.04 211.88 383.97 211.94 383.95 211.93 383.9 212.11 383.9 212.12 383.9 212.12 383.9 212.12 Z M 383.9 211.68 383.9 211.7 383.9 211.7 383.9 211.7 383.9 211.7 383.91 211.71 383.97 211.69 384.04 211.81 383.89 211.75 383.89 211.75 383.88 211.75 383.84 211.75 383.86 211.66 383.9 211.68 Z M 383.89 211.75 383.89 211.75 383.89 211.75 383.89 211.75 Z M 383.89 211.75 383.89 211.75 383.89 211.74 383.89 211.75 Z M 383.92 211.68 383.91 211.68 383.91 211.68 383.92 211.68 Z M 383.59 211.52 383.7 211.55 383.7 211.55 383.7 211.55 383.7 211.55 383.71 211.56 383.74 211.57 383.65 211.63 383.58 211.53 383.6 211.5 383.59 211.52 Z M 389.34 220.33 389.35 220.32 389.76 219.77 389.14 218.97 389.13 218.9 389.18 218.04 389.24 217.96 389.55 218 389.64 218.03 389.69 218.03 389.99 218.05 389.95 218.04 389.68 217.93 389.63 217.92 389.18 217.54 389.48 216.96 389.45 216.99 389.43 216.99 389.41 217.03 389.11 217.57 388.96 218.3 388.95 218.32 388.95 218.31 388.89 218.3 388.87 218.31 388.83 218.3 388.28 218.37 388.28 218.37 388.25 218.36 388.23 218.34 388.21 218.34 388.17 217.98 388.16 217.92 388.16 217.91 388.16 217.81 388.18 217.77 388.24 217.66 388.27 217.6 388.32 217.52 388.33 217.51 388.37 217.45 388.46 217.28 388.5 217.24 389.1 216.7 389.08 216.71 388.9 216.81 388.81 216.8 388.76 216.84 388.75 216.86 388.72 216.91 388.2 217.5 388.17 217.52 388.19 217.54 388.17 217.6 388.16 217.66 388.13 217.68 388.11 217.68 388.09 217.72 388.05 217.75 388.04 217.74 388.02 217.77 387.97 217.73 387.95 218.88 387.92 218.93 387.9 219.38 387.88 219.44 387.87 219.43 387.87 219.42 387.84 219.43 387.82 219.46 387.83 219.49 387.83 219.54 387.82 219.56 387.83 219.59 387.8 219.64 387.78 219.78 387.76 219.8 387.63 220.04 387.59 220.03 387.7 220.06 387.71 220.1 387.75 220.15 387.76 220.2 387.77 220.25 387.32 220.55 387.22 220.56 387.15 220.52 387.13 220.47 387.56 218.59 387.55 218.59 387.56 218.59 387.55 218.59 387.55 218.59 387.52 218.61 387.35 217.91 387.8 217.04 387.62 216.51 387.63 216.47 387.92 215.97 386.91 215.57 386.25 215 386.21 214.95 386.2 214.92 386.2 214.92 386.2 214.91 386.21 214.89 386.21 214.88 386.21 214.86 386.89 214.76 387.02 213.98 387.01 213.98 387.01 213.98 387.01 213.98 387.52 212.9 387.56 212.29 387.56 212.29 387.17 212.34 386.98 211.82 387.11 210.22 388.48 209.93 388.23 209.72 387.9 209.31 388.27 209.34 388.02 208.65 388.58 208.57 388.61 208.45 388.62 208.38 388.59 208.32 388.6 208.3 388.55 208.07 388.76 207.68 388.92 206.99 389.38 207.37 389.39 207.36 389.39 207.36 389.39 207.36 389.4 207.36 389.76 207.47 389.76 207.47 389.77 207.47 389.99 207.19 390 207.19 390 207.2 390 207.2 390 207.2 390.01 207.2 390.14 207.32 390.14 207.31 390.23 207.44 390.15 207.52 390.1 207.67 390.19 207.63 390.17 207.62 390.19 207.61 390.19 207.58 390.2 207.55 390.34 207.37 390.43 207.35 390.44 207.35 390.45 207.34 391.44 207.26 391.87 207.03 392.86 206.87 392.91 206.86 393.24 207.67 393.23 207.69 393.23 207.71 393.24 207.75 393.23 207.75 393.22 207.75 392.86 208.35 391.17 209.77 391.36 210.38 391.15 210.98 391.42 211.34 392.58 210.78 393.25 211.02 394.28 210.96 394.29 210.96 394.29 210.96 394.29 210.96 394.3 210.95 395.87 211.19 395.96 211.24 395.95 211.29 395.95 211.33 396 211.49 396.07 211.67 396.08 211.69 396.08 211.69 396.08 211.7 396.08 211.71 396.06 211.71 396.07 211.7 396.04 211.69 396.03 211.7 396.03 211.73 396.03 211.73 396.05 211.74 396.02 211.77 396.04 211.79 396 211.95 395.99 211.96 395.84 212.2 395.4 213.02 395.13 214.12 394.38 215.5 393.79 216.01 394.27 216.66 394.25 216.7 394.24 216.71 394.2 216.73 394.19 216.75 394.18 216.77 393.44 216.94 392.49 217.73 391.88 217.59 391.79 217.56 391.73 217.48 391.71 217.47 391.73 217.55 391.74 217.6 391.74 217.64 391.76 217.66 392.77 217.85 392.79 217.84 392.79 217.84 392.79 217.84 392.79 217.84 392.8 217.83 393.05 217.89 393.27 217.95 394.19 217.56 395.43 218.41 395.45 218.44 395.47 218.49 395.48 218.51 395.49 218.51 395.45 218.55 395.42 218.56 395.38 218.59 395.38 218.63 395.35 218.71 395.32 218.73 395.3 218.79 395.27 218.8 395.19 218.87 395.2 218.92 395.05 219.17 395.02 219.19 394.82 219.21 394.85 219.24 395.11 219.81 395.18 219.85 395.2 219.86 395.16 219.88 395.15 219.91 395.14 219.92 395.07 220.01 394.18 220.71 394.17 220.73 394.03 220.96 393.98 221.02 393.72 221.17 393.72 221.21 393.59 221.35 393.55 221.38 393.5 221.41 393.48 221.42 393.49 221.45 393.45 221.47 393.29 221.47 393.23 221.71 393.21 221.74 393.07 221.8 392.99 221.8 392.56 221.78 392.45 221.78 391.52 222.35 391.49 222.39 391.34 222.48 391.23 222.54 391.15 222.57 391.07 222.56 391.02 222.56 391.01 222.55 391 222.47 391.01 222.45 391.01 222.44 391.02 222.4 391.04 222.28 391.02 222.26 390.93 222.57 390.89 222.55 390.87 222.55 390.82 222.55 390.77 222.52 390.68 222.41 390.67 222.37 390.63 222.3Line truncated
<path d="M 383.9 212.12 383.9 212.13 383.87 212.12 383.85 212.11 383.75 212.09 383.75 212.09 383.75 212.09 383.75 212.09 383.59 211.87 383.57 211.86 383.57 211.86 383.57 211.86 383.56 211.86 383.66 211.77 383.72 211.77 383.73 211.75 383.78 211.76 383.84 211.79 384.04 211.88 383.97 211.94 383.95 211.93 383.9 212.11 383.9 212.12 383.9 212.12 383.9 212.12 Z M 383.9 211.68 383.9 211.7 383.9 211.7 383.9 211.7 383.9 211.7 383.91 211.71 383.97 211.69 384.04 211.81 383.89 211.75 383.89 211.75 383.88 211.75 383.84 211.75 383.86 211.66 383.9 211.68 Z M 383.89 211.75 383.89 211.75 383.89 211.75 383.89 211.75 Z M 383.89 211.75 383.89 211.75 383.89 211.74 383.89 211.75 Z M 383.92 211.68 383.91 211.68 383.91 211.68 383.92 211.68 Z M 383.59 211.52 383.7 211.55 383.7 211.55 383.7 211.55 383.7 211.55 383.71 211.56 383.74 211.57 383.65 211.63 383.58 211.53 383.6 211.5 383.59 211.52 Z M 389.34 220.33 389.35 220.32 389.76 219.77 389.14 218.97 389.13 218.9 389.18 218.04 389.24 217.96 389.55 218 389.64 218.03 389.69 218.03 389.99 218.05 389.95 218.04 389.68 217.93 389.63 217.92 389.18 217.54 389.48 216.96 389.45 216.99 389.43 216.99 389.41 217.03 389.11 217.57 388.96 218.3 388.95 218.32 388.95 218.31 388.89 218.3 388.87 218.31 388.83 218.3 388.28 218.37 388.28 218.37 388.25 218.36 388.23 218.34 388.21 218.34 388.17 217.98 388.16 217.92 388.16 217.91 388.16 217.81 388.18 217.77 388.24 217.66 388.27 217.6 388.32 217.52 388.33 217.51 388.37 217.45 388.46 217.28 388.5 217.24 389.1 216.7 389.08 216.71 388.9 216.81 388.81 216.8 388.76 216.84 388.75 216.86 388.72 216.91 388.2 217.5 388.17 217.52 388.19 217.54 388.17 217.6 388.16 217.66 388.13 217.68 388.11 217.68 388.09 217.72 388.05 217.75 388.04 217.74 388.02 217.77 387.97 217.73 387.95 218.88 387.92 218.93 387.9 219.38 387.88 219.44 387.87 219.43 387.87 219.42 387.84 219.43 387.82 219.46 387.83 219.49 387.83 219.54 387.82 219.56 387.83 219.59 387.8 219.64 387.78 219.78 387.76 219.8 387.63 220.04 387.59 220.03 387.7 220.06 387.71 220.1 387.75 220.15 387.76 220.2 387.77 220.25 387.32 220.55 387.22 220.56 387.15 220.52 387.13 220.47 387.56 218.59 387.55 218.59 387.56 218.59 387.55 218.59 387.55 218.59 387.52 218.61 387.35 217.91 387.8 217.04 387.62 216.51 387.63 216.47 387.92 215.97 386.91 215.57 386.25 215 386.21 214.95 386.2 214.92 386.2 214.92 386.2 214.91 386.21 214.89 386.21 214.88 386.21 214.86 386.89 214.76 387.02 213.98 387.01 213.98 387.01 213.98 387.01 213.98 387.52 212.9 387.56 212.29 387.56 212.29 387.17 212.34 386.98 211.82 387.11 210.22 388.48 209.93 388.23 209.72 387.9 209.31 388.27 209.34 388.02 208.65 388.58 208.57 388.61 208.45 388.62 208.38 388.59 208.32 388.6 208.3 388.55 208.07 388.76 207.68 388.92 206.99 389.38 207.37 389.39 207.36 389.39 207.36 389.39 207.36 389.4 207.36 389.76 207.47 389.76 207.47 389.77 207.47 389.99 207.19 390 207.19 390 207.2 390 207.2 390 207.2 390.01 207.2 390.14 207.32 390.14 207.31 390.23 207.44 390.15 207.52 390.1 207.67 390.19 207.63 390.17 207.62 390.19 207.61 390.19 207.58 390.2 207.55 390.34 207.37 390.43 207.35 390.44 207.35 390.45 207.34 391.44 207.26 391.87 207.03 392.86 206.87 392.91 206.86 393.24 207.67 393.23 207.69 393.23 207.71 393.24 207.75 393.23 207.75 393.22 207.75 392.86 208.35 391.17 209.77 391.36 210.38 391.15 210.98 391.42 211.34 392.58 210.78 393.25 211.02 394.28 210.96 394.29 210.96 394.29 210.96 394.29 210.96 394.3 210.95 395.87 211.19 395.96 211.24 395.95 211.29 395.95 211.33 396 211.49 396.07 211.67 396.08 211.69 396.08 211.69 396.08 211.7 396.08 211.71 396.06 211.71 396.07 211.7 396.04 211.69 396.03 211.7 396.03 211.73 396.03 211.73 396.05 211.74 396.02 211.77 396.04 211.79 396 211.95 395.99 211.96 395.84 212.2 395.4 213.02 395.13 214.12 394.38 215.5 393.79 216.01 394.27 216.66 394.25 216.7 394.24 216.71 394.2 216.73 394.19 216.75 394.18 216.77 393.44 216.94 392.49 217.73 391.88 217.59 391.79 217.56 391.73 217.48 391.71 217.47 391.73 217.55 391.74 217.6 391.74 217.64 391.76 217.66 392.77 217.85 392.79 217.84 392.79 217.84 392.79 217.84 392.79 217.84 392.8 217.83 393.05 217.89 393.27 217.95 394.19 217.56 395.43 218.41 395.45 218.44 395.47 218.49 395.48 218.51 395.49 218.51 395.45 218.55 395.42 218.56 395.38 218.59 395.38 218.63 395.35 218.71 395.32 218.73 395.3 218.79 395.27 218.8 395.19 218.87 395.2 218.92 395.05 219.17 395.02 219.19 394.82 219.21 394.85 219.24 395.11 219.81 395.18 219.85 395.2 219.86 395.16 219.88 395.15 219.91 395.14 219.92 395.07 220.01 394.18 220.71 394.17 220.73 394.03 220.96 393.98 221.02 393.72 221.17 393.72 221.21 393.59 221.35 393.55 221.38 393.5 221.41 393.48 221.42 393.49 221.45 393.45 221.47 393.29 221.47 393.23 221.71 393.21 221.74 393.07 221.8 392.99 221.8 392.56 221.78 392.45 221.78 391.52 222.35 391.49 222.39 391.34 222.48 391.23 222.54 391.15 222.57 391.07 222.56 391.02 222.56 391.01 222.55 391 222.47 391.01 222.45 391.01 222.44 391.02 222.4 391.04 222.28 391.02 222.26 390.93 222.57 390.89 222.55 390.87 222.55 390.82 222.55 390.77 222.52 390.68 222.41 390.67 222.37 390.63 222.3Line truncated
<path d="M 388 233.39 388.01 233.39 388.01 233.39 388 233.39 Z M 388.95 232.79 388.95 232.78 388.95 232.78 388.95 232.79 Z M 390.37 228.78 390.37 228.78 390.37 228.78 390.37 228.78 Z M 389.9 228.3 389.89 228.3 389.89 228.31 389.86 228.32 389.83 228.32 389.82 228.32 389.82 228.33 389.81 228.33 389.78 228.31 389.78 228.3 389.77 228.2 389.72 228.18 389.64 228.17 389.61 228.16 389.63 228.04 389.68 228.03 389.74 228.02 389.74 228.02 389.81 228.16 389.89 228.27 389.9 228.3 Z M 390.5 228.71 390.5 228.71 390.5 228.71 390.5 228.71 Z M 389.99 228.41 389.98 228.4 389.97 228.37 389.91 228.24 389.88 228.24 389.87 228.22 389.86 228.22 389.84 228.2 389.84 228.19 389.85 228.17 389.89 227.83 389.88 227.81 389.87 227.8 389.87 227.77 389.87 227.75 389.9 227.73 389.92 227.72 389.96 227.71 390 227.68 390.03 227.69 390.1 227.69 390.11 227.68 390.13 227.67 390.13 227.66 390.49 227.68 390.5 227.69 390.66 228.1 390.69 228.13 390.73 228.12 390.77 228.11 390.77 228.1 390.81 228.09 391.04 228.07 391.03 228.1 390.94 228.25 390.69 228.43 390.41 228.75 390.38 228.74 390.22 228.73 390.21 228.72 390.17 228.64 390.15 228.65 390.02 228.46 390.01 228.46 390.01 228.45 389.99 228.41 Z M 389.6 234.15 389.59 234.17 389.58 234.16 389.56 234.15 389.57 234.14 389.57 234.14 389.6 234.15 Z M 388.69 234.05 388.65 234.02 388.65 233.99 388.66 233.45 388.64 233.38 388.23 233.36 388.22 233.34 388.23 233.33 388.22 233.29 388.23 233.26 388.24 233.21 388.24 233.19 388.25 233.19 388.28 233.17 388.7 232.97 388.73 232.96 390.54 231.99 390.69 231.87 390.71 231.84 391 230.97 391.02 230.95 391.2 230.89 391.26 230.84 391.29 230.86 391.29 230.85 390.75 229.56 389.58 229.95 389.53 229.97 389.46 229.99 389.45 229.99 389.45 229.99 389.44 229.98 389.44 229.95 389.57 229.74 389.6 229.7 389.69 229.57 389.71 229.57 389.88 229.43 389.94 229.45 390.01 229.4 390.04 229.38 390.09 229.34 390.34 229.1 390.45 228.75 390.67 228.48 390.78 228.41 391.4 227.97 391.48 227.97 392.22 228.06 392.3 228 392.56 227.93 392.66 227.91 392.67 227.96 392.74 228.03 392.78 228.06 393.25 228.41 393.25 228.41 393.21 228.29 393.27 228.29 393.46 228.44 393.47 228.61 393.42 228.63 393.6 228.77 393.61 228.81 393.93 229.28 393.96 229.29 393.95 229.37 393.95 229.39 393.95 229.42 393.96 229.44 393.42 229.35 393.4 229.35 393.35 231.7 393.05 232.36 393.35 233.14 394.11 233.46 394.11 234.02 394.1 234.04 394.06 234.12 394.08 234.17 394.08 234.17 394.11 234.21 394.09 234.26 394.06 234.27 394.03 234.3 394.01 234.32 393.96 234.36 393.11 234.68 393.07 234.71 392.99 234.78 392.96 234.78 392.95 234.83 392.97 234.91 392.94 235 392.89 235.01 392.75 235.04 392.72 235.04 392.66 235.03 392.63 235.05 392.54 235.06 391.95 234.81 391.93 234.75 391.88 234.72 391.82 234.74 391.8 234.75 391.74 234.7 391.7 234.64 391.69 234.62 391.66 234.51 391.57 234.41 391.54 234.31 391.48 234.23 391.5 234.21 390.77 234.49 390.18 233.79 389.9 233.79 389.72 233.81 389.61 233.86 389.56 234.1 389.5 234.11 389.09 234.3 389.07 234.3 388.94 234.25 388.93 234.25 388.84 234.23 388.7 234.06 388.69 234.05 388.69 234.05 388.69 234.05 Z M 388.16 233.41 388.16 233.41 388.17 233.4 388.16 233.41 Z" fill-rule="evenodd" id="GBR_WLS" data-gid_0="GBR" data-country="UnitedKingdom" data-gid="GBR_WLS" data-name="Wales"/>
<path d="M 388.69 239.6 388.69 239.6 388.78 239.71 388.79 239.72 388.62 239.88 388.54 239.91 388.52 239.97 388.51 240.02 388.5 240.03 388.48 240.03 388.47 240.04 388.46 240.04 388.46 240.04 388.43 240.02 388.42 240 387.91 239.5 387.86 239.48 387.83 239.46 387.74 239.49 387.74 239.49 387.74 239.51 387.71 239.55 387.71 239.55 387.7 239.55 387.71 239.55 387.71 239.66 387.67 239.7 387.36 239.49 387.35 239.47 387.46 239.34 387.52 239.33 387.54 239.3 387.55 239.28 387.57 239.28 387.79 239.15 387.85 239.15 387.92 239.23 387.95 239.25 387.96 239.26 388.04 239.09 388.06 239.07 388.07 239.06 388.09 239.08 388.1 239.09 388.2 239.05 388.3 238.96 388.33 238.95 388.36 238.92 388.38 238.91 388.4 238.86 388.39 238.8 388.43 238.79 388.56 238.71 388.58 238.69 388.86 238.03 389.9 237.16 390.69 235.71 392.14 235.6 393.23 235.7 393.43 235.07 394.6 233.8 394.67 233.65 394.13 234.23 394.11 234.25 394.11 234.21 394.08 234.17 394.08 234.17 394.06 234.12 394.1 234.04 394.11 234.02 394.11 233.46 393.35 233.14 393.05 232.36 393.35 231.7 393.4 229.35 393.42 229.35 393.96 229.44 393.95 229.42 393.95 229.39 393.95 229.37 393.96 229.29 393.93 229.28 393.61 228.81 393.6 228.77 393.42 228.63 393.47 228.61 393.46 228.44 393.27 228.29 393.21 228.29 393.21 227.61 393.28 227.62 393.31 227.7 393.3 227.73 393.25 227.73 393.25 227.73 393.31 227.75 393.51 228.09 393.77 228.09 393.39 227.81 393.14 227.1 393.22 226.34 393.26 226.33 393.27 226.29 393.25 226.22 393.25 226.2 393.22 226.21 393.22 226.14 393.78 225.08 393.8 225.04 393.68 224.82 393.68 224.76 393.79 224.67 393.82 224.64 393.76 224.57 393.78 224.61 393.77 224.65 393.44 224.92 393.37 224.92 393.36 224.85 393.29 224.75 393.25 224.61 393.26 224.6 393.27 224.59 393.27 224.58 393.27 224.59 393.25 224.59 393.23 224.62 393.24 224.64 393.24 224.67 393.26 224.71 393.06 225.11 393 225.16 391.94 223.57 391.94 223.53 392.02 223.41 392.53 222.1 392.84 222.05 392.86 222.05 392.81 222.02 392.75 222.06 392.69 222.03 392.71 221.94 392.79 221.9 392.84 221.87 392.93 221.87 393 221.92 393.08 221.96 393.19 221.92 393.29 221.9 393.26 221.89 393.19 221.86 393.15 221.87 393.19 221.81 393.27 221.81 393.25 221.75 393.23 221.71 393.29 221.47 393.45 221.47 393.49 221.45 393.48 221.42 393.5 221.41 393.55 221.38 393.59 221.35 393.72 221.21 393.72 221.17 393.98 221.02 394.03 220.96 394.17 220.73 394.18 220.71 395.07 220.01 395.14 219.92 395.15 219.91 395.16 219.88 395.2 219.86 395.18 219.85 395.11 219.81 394.85 219.24 394.82 219.21 395.02 219.19 395.05 219.17 395.2 218.92 395.19 218.87 395.27 218.8 395.3 218.79 395.32 218.73 395.35 218.71 395.38 218.63 395.38 218.59 395.42 218.56 395.45 218.55 395.49 218.51 395.5 218.53 395.57 218.63 395.58 218.65 396.4 219.53 396.4 219.54 396.62 221.07 397.45 223.11 398.85 223.8 399.19 224.57 399.78 225.01 399.53 225.48 400.27 226.78 401.1 229.38 401.13 229.35 401.15 229.33 401.2 229.31 402.61 229.42 402.8 229.44 402.98 229.51 403.12 229.61 403.27 229.75 403.59 230.02 403.76 230.24 403.86 230.56 403.86 230.61 403.86 230.69 403.85 230.7 403.85 230.73 403.85 230.76 403.86 230.79 403.85 230.91 403.51 232.53 402.2 233.52 402.1 234.27 401.41 234.87 402.14 235.19 402.24 235.18 403.06 235.04 403.14 235.03 403.17 235.04 403.2 235.06 403.21 235.08 403.21 235.1 403.2 235.16 403.19 235.19 403.15 235.26 403.14 235.27 403.05 235.4 403.11 235.75 403.11 235.78 403.1 235.87 403.07 235.89 403.03 235.94 402.98 235.98 400.92 237.02 400.77 237.09 400.73 237.16 400.69 237.2 400.65 237.24 400.6 237.29 400.58 237.34 400.55 237.35 400.54 237.36 400.42 237.31 399.52 237.03 398.38 237.23 398.34 237.26 398.31 237.32 398.19 237.34 396.92 237.2 396.91 237.21 396.92 237.21 396.56 237.43 396.19 237.35 395.13 237.74 394.58 238.1 394.55 238.12 393.55 237.36 392.37 237.81 392.2 238.66 391.67 239.02 391.67 239.02 391.67 239.02 391.67 239.02 391.67 239.02 391.68 239.01 390.71 238.67 389.44 238.79 388.69 239.6 388.69 239.6 388.69 239.6 Z M 396.91 237.21 396.91 237.21 396.91 237.21 396.91 237.21 Z M 396.91 237.21 396.91 237.21 396.89 237.21 396.91 237.21 Z M 397.31 237.35 397.58 237.49 397.6 237.55 397.18 237.89 397.1 237.9 397.15 237.34 397.16 237.36 397.16 237.34 397.15 237.32 397.14 237.26 397.31 237.35 Z M 397.16 237.36 397.16 237.37 397.15 237.4 397.16 237.38 397.17 237.36 397.16 237.36 Z M 386.06 240.02 386.06 240.02 386.05 240.01 386.06 240.02 386.06 240.02 386.06 240.02 386.06 240.02 Z M 396.93 237.2 396.92 237.2 396.93 237.19 396.93 237.2 Z M 393.09 235.1 393.07 235.08 393.09 235.08 393.09 235.1 Z M 388.69 239.6 388.69 239.6 388.69 239.6 388.69 239.6 Z M 391.67 239.02 391.67 239.02 391.67 239.02 391.67 239.02 391.67 239.02 Z M 391.65 239.08 391.65 239.08 391.65 239.07 391.65 239.08 Z M 391.42 238.98 391.42 238.98 391.42 238.98 391.42 238.98 Z" fill-rule="evenodd" id="GBR_NA" data-gid_0="GBR" data-country="UnitedKingdom" data-gid="GBR_NA" data-name="NA"/>
<path d="M 393.26 226.33 393.22 226.34 393.22 226.21 393.25 226.2 393.25 226.22 393.27 226.29 393.26 226.33 Z M 397.72 199.54 397.72 199.54 397.72 199.54 397.72 199.54 Z M 398.26 199.14 398.26 199.14 398.27 199.14 398.26 199.14 Z M 398.36 199.12 398.35 199.14 398.34 199.11 398.36 199.12 Z M 397.81 198.26 397.78 198.36 397.79 198.3 397.81 198.26 Z M 398.11 198.22 398.24 198.42 398.25 198.45 398.24 198.45 398.08 198.19 398.11 198.22 Z M 397.34 198.83 397.33 198.8 397.34 198.78 397.37 198.81 397.39 198.84 397.34 198.83 Z M 398.36 199.16 398.34 199.15 398.36 199.13 398.36 199.16 Z M 397.63 197.75 397.67 197.78 397.69 197.78 397.75 198.17 397.7 198.8 397.36 198.69 397.62 197.74 397.63 197.75 Z M 397.98 198.18 397.97 198.17 397.98 198.17 397.99 198.16 397.98 198.18 Z M 397.61 197.75 397.61 197.75 397.61 197.75 397.61 197.75 Z M 397.63 197.74 397.63 197.74 397.63 197.74 397.63 197.74 Z M 397.99 197.99 398.02 198.01 398.05 198.02 397.96 197.99 397.99 197.99 Z M 398.07 197.25 398.28 197.31 398.28 197.32 397.97 197.37 397.97 197.36 398.04 197.23 398.07 197.25 Z" fill-rule="evenodd" id="NA_NA" data-gid_0="NA" data-country="NA" data-gid="NA_NA" data-name="NA"/>
</g>
<g id="GBR2">
<path d="M 397.16 237.36 397.16 237.34 397.15 237.32 397.14 237.26 397.31 237.35 397.58 237.49 397.6 237.55 397.18 237.89 397.1 237.9 397.15 237.34 397.16 237.36 Z M 397.16 237.36 397.16 237.37 397.15 237.4 397.16 237.38 397.17 237.36 397.16 237.36 Z M 383.75 212.09 383.75 212.09 383.59 211.87 383.57 211.86 383.57 211.86 383.57 211.86 383.56 211.86 383.66 211.77 383.72 211.77 383.73 211.75 383.78 211.76 383.84 211.79 384.04 211.88 383.97 211.94 383.95 211.93 383.9 212.11 383.9 212.12 383.9 212.13 383.87 212.12 383.85 212.11 383.75 212.09 383.75 212.09 383.75 212.09 Z M 383.9 211.68 383.9 211.7 383.9 211.7 383.91 211.71 383.97 211.69 384.04 211.81 383.89 211.75 383.89 211.75 383.88 211.75 383.84 211.75 383.86 211.66 383.9 211.68 Z M 383.89 211.75 383.89 211.75 383.89 211.75 383.89 211.75 Z M 383.89 211.75 383.89 211.75 383.89 211.74 383.89 211.75 Z M 383.91 211.68 383.92 211.68 383.91 211.68 383.91 211.68 Z M 383.59 211.52 383.7 211.55 383.7 211.55 383.7 211.55 383.7 211.55 383.71 211.56 383.74 211.57 383.65 211.63 383.58 211.53 383.6 211.5 383.59 211.52 Z M 388.69 239.6 388.69 239.6 388.78 239.71 388.79 239.72 388.62 239.88 388.54 239.91 388.52 239.97 388.51 240.02 388.5 240.03 388.48 240.03 388.47 240.04 388.46 240.04 388.46 240.04 388.43 240.02 388.42 240 387.91 239.5 387.86 239.48 387.83 239.46 387.74 239.49 387.74 239.49 387.74 239.51 387.71 239.55 387.71 239.55 387.7 239.55 387.71 239.55 387.71 239.66 387.67 239.7 387.36 239.49 387.35 239.47 387.46 239.34 387.52 239.33 387.54 239.3 387.55 239.28 387.57 239.28 387.79 239.15 387.85 239.15 387.92 239.23 387.95 239.25 387.96 239.26 388.04 239.09 388.06 239.07 388.07 239.06 388.09 239.08 388.1 239.09 388.2 239.05 388.3 238.96 388.33 238.95 388.36 238.92 388.38 238.91 388.4 238.86 388.39 238.8 388.43 238.79 388.56 238.71 388.58 238.69 388.86 238.03 389.9 237.16 390.69 235.71 392.14 235.6 393.23 235.7 393.43 235.07 394.6 233.8 394.67 233.65 394.13 234.23 394.11 234.25 394.09 234.26 394.06 234.27 394.03 234.3 394.01 234.32 393.96 234.36 393.11 234.68 393.07 234.71 392.99 234.78 392.96 234.78 392.95 234.83 392.97 234.91 392.94 235 392.89 235.01 392.75 235.04 392.72 235.04 392.66 235.03 392.63 235.05 392.54 235.06 391.95 234.81 391.93 234.75 391.88 234.72 391.82 234.74 391.8 234.75 391.74 234.7 391.7 234.64 391.69 234.62 391.66 234.51 391.57 234.41 391.54 234.31 391.48 234.23 391.5 234.21 390.77 234.49 390.18 233.79 389.9 233.79 389.72 233.81 389.61 233.86 389.56 234.1 389.5 234.11 389.09 234.3 389.07 234.3 388.94 234.25 388.93 234.25 388.84 234.23 388.7 234.06 388.69 234.05 388.69 234.05 388.69 234.05 388.65 234.02 388.65 233.99 388.66 233.45 388.64 233.38 388.23 233.36 388.22 233.34 388.23 233.33 388.22 233.29 388.23 233.26 388.24 233.21 388.24 233.19 388.25 233.19 388.28 233.17 388.7 232.97 388.73 232.96 390.54 231.99 390.69 231.87 390.71 231.84 391 230.97 391.02 230.95 391.2 230.89 391.26 230.84 391.29 230.86 391.29 230.85 390.75 229.56 389.58 229.95 389.53 229.97 389.46 229.99 389.45 229.99 389.45 229.99 389.44 229.98 389.44 229.95 389.57 229.74 389.6 229.7 389.69 229.57 389.71 229.57 389.88 229.43 389.94 229.45 390.01 229.4 390.04 229.38 390.09 229.34 390.34 229.1 390.45 228.75 390.67 228.48 390.78 228.41 391.4 227.97 391.48 227.97 392.22 228.06 392.3 228 392.56 227.93 392.66 227.91 392.67 227.96 392.74 228.03 392.78 228.06 393.25 228.41 393.25 228.41 393.21 228.29 393.21 227.61 393.28 227.62 393.31 227.7 393.3 227.73 393.25 227.73 393.25 227.73 393.31 227.75 393.51 228.09 393.77 228.09 393.39 227.81 393.14 227.1 393.22 226.34 393.22 226.14 393.78 225.08 393.8 225.04 393.68 224.82 393.68 224.76 393.79 224.67 393.82 224.64 393.76 224.57 393.78 224.61 393.77 224.65 393.44 224.92 393.37 224.92 393.36 224.85 393.29 224.75 393.25 224.61 393.26 224.6 393.27 224.59 393.27 224.58 393.27 224.59 393.23 224.62 393.24 224.64 393.24 224.67 393.26 224.71 393.06 225.11 393 225.16 391.94 223.57 391.94 223.53 392.02 223.41 392.53 222.1 392.84 222.05 392.86 222.05 392.81 222.02 392.75 222.06 392.69 222.03 392.71 221.94 392.79 221.9 392.84 221.87 392.93 221.87 393 221.92 393.08 221.96 393.19 221.92 393.29 221.9 393.26 221.89 393.19 221.86 393.15 221.87 393.19 221.81 393.27 221.81 393.25 221.75 393.21 221.74 393.07 221.8 392.99 221.8 392.56 221.78 392.45 221.78 391.52 222.35 391.49 222.39 391.34 222.48 391.23 222.54 391.15 222.57 391.07 222.56 391.02 222.56 391.01 222.55 391 222.47 391.01 222.45 391.01 222.44 391.02 222.4 391.04 222.28 391.02 222.26 390.93 222.57 390.89 222.55 390.87 222.55 390.82 222.55 390.77 222.52 390.68 222.41 390.67 222.37 390.63 222.31 390.65 222.28 390.06 222.84 389.17 222.88 389.19 222.89 389.2 222.9 389.18 222.95 389.19 223.07 389.22 223.09 389.17 223.07 389.12 223.05 389.06 223.03 388.59 222.22 388.59 222.18 388.5 221.78 388.52 221.75 388.56 221.66 388.58 221.65 388.67 221.61 388.72 221.63 388.78 221.96 388.83 222.02 388.78 221.58 389.34 220.33 389.34 220.33 389.34 220.33 389.35 220.32 389.76 219.77 389.14 218.97 389.13 218.9 389.18 218.04 389.24 Line truncated
@@ -4884,4 +4883,8 @@
<g id="ZWE2">
<path d="M 472.5 411.03 472.51 411.07 472.57 411.14 472.61 411.14 472.66 411.12 472.78 411.11 472.88 411.33 472.85 411.47 472.82 411.72 472.78 411.8 472.73 411.86 472.65 411.92 472.67 412 472.65 412.13 472.81 412.19 472.8 412.29 472.82 412.37 472.82 412.53 472.78 412.66 472.93 412.67 472.96 412.66 473.07 412.61 473.1 412.69 473.05 412.75 473.27 412.9 473.23 413.16 473.15 413.48 473.09 413.5 473.08 413.51 472.96 413.57 472.97 413.59 472.86 413.68 472.86 413.85 472.81 413.89 472.84 414.07 472.71 414.27 472.71 414.3 472.63 414.39 472.53 414.52 472.06 414.84 472.05 414.85 472.02 414.88 472.02 414.9 472.01 415.01 471.97 415.81 471.79 416.02 471.77 416.07 471.83 416.19 471.83 416.2 471.82 416.28 471.89 416.38 471.99 416.52 471.92 416.52 471.88 416.53 471.82 416.56 469.56 419.06 469.35 419.13 469.32 419.06 469.3 419.04 469.27 419.03 469.23 419.04 469.13 418.97 469.07 418.95 469 418.96 468.97 418.97 468.39 418.87 468.24 418.88 467.14 419.02 467.07 418.92 466.94 418.87 466.91 418.87 466.79 418.9 466.52 418.71 466.5 418.71 465.78 418.49 465.67 418.49 465.53 418.52 465.47 418.57 464.35 418.12 464.37 417.84 464.45 417.74 464.32 417.66 463.94 417.55 463.54 417.36 463.1 417.34 463.07 417.32 462.22 417.16 462.08 417.11 462.07 417.03 462.03 416.95 461.98 416.9 462 416.89 462 416.84 461.98 416.78 461.4 415.9 461.43 415.71 461.41 415.58 461.4 415.47 461.43 415.43 461.45 415.32 461.46 415.27 461.42 414.99 461.42 414.97 461.41 414.85 461.45 414.8 460.65 414.52 460.34 413.67 460.31 413.62 459.29 413.27 459.19 413.17 459.19 413.16 459.14 413.15 458.51 412.67 458.49 412.63 458.41 412.65 458.38 412.63 458.36 412.59 458.07 412.38 457.99 412.29 457.59 411.18 457.61 411.16 457.6 411.02 457.57 410.95 457.52 410.85 457.15 410.19 456.5 409.42 456.44 409.28 456.41 409.24 455.98 408.59 455.95 408.49 456.02 408.27 456.01 408.24 456.01 408.24 456.01 408.23 456.11 408.29 456.63 408.35 456.69 408.35 457.1 408.37 457.26 408.47 457.29 408.49 457.37 408.68 457.42 408.68 458.1 408.46 458.12 408.47 459.07 408.86 459.14 408.89 459.18 408.92 459.22 408.91 459.93 408.65 461.91 406.23 462.19 406.13 463.92 405.12 463.93 405.09 464 404.28 463.99 404.21 464.18 403.97 464.27 403.97 464.66 403.67 464.82 403.57 464.97 403.5 465.07 403.45 465.2 403.4 465.29 403.36 465.38 403.38 466.03 403.2 466.24 403.2 467.02 403.29 467.08 403.23 467.3 403.28 467.42 403.21 467.41 403.2 467.44 403.23 467.44 404.1 468.61 404.14 468.68 404.24 468.78 404.16 468.86 404.1 468.88 404.14 469.11 404.08 469.16 404.11 469.19 404.12 469.27 404.12 469.47 404.22 469.49 404.29 469.61 404.42 469.66 404.41 469.67 404.45 469.75 404.47 470.47 404.7 470.5 404.72 470.53 404.74 470.52 404.78 470.55 404.78 470.56 404.81 470.72 404.95 470.74 405.05 471.02 405.12 471.57 405.1 471.71 405.14 472.51 405.49 472.51 405.68 472.64 405.74 473.1 405.73 472.96 406.17 472.81 406.22 472.78 406.23 472.79 406.25 472.82 406.29 473.01 406.57 473.12 406.83 473.13 406.87 473.14 406.99 473.14 407.13 473.22 407.19 473.25 407.22 473.15 407.37 473.14 407.44 473.11 407.47 473.19 408.08 473.16 408.08 473.17 408.14 473.21 408.17 473.18 408.2 473.18 408.22 473.17 408.26 473.08 408.27 473.06 408.31 473.06 408.4 473.05 408.52 473.09 408.53 473.09 408.58 473.03 408.65 473.02 408.67 473.09 408.99 473.27 409.58 473.23 409.63 473.2 409.82 473.06 409.85 473.03 409.88 473 409.89 472.94 409.9 472.91 409.92 472.92 410 472.9 410.09 472.95 410.57 472.7 410.58 472.5 410.73 472.55 410.9 472.48 410.92 472.5 411.03 Z" data-gid_0="ZWE" data-country="Zimbabwe"/>
</g>
<g id="ATA">
<path d="m274.87 545.95l-.12-.25-.2-.06-.49-.02-1.05.21-.76.29-1.01.18-.43.04-.36.26-.4.09-.64.24-1.05.19-.64.04-1.28.32-.13.08.08.09-.43.36-.2.11-.49.14-.16.11-.07.15-.29.13-.27.01-.28.03-.56.23-.23.04-.21-.04-.14-.19-.22.03-.16.22.11.17-.3.05-.25-.03-.75.22.07.19.12.11-.06.13-.26-.03-.19-.11-.48.02-.61-.11-.33.13-.28.19-.07.22.04.3.32.11.24.03-.05.11-.09.06-.45-.01-.14.04-.11.1-.07.04-.5.01.05.09.06.06-.1.13-.09.03-.37-.07-.06.14.04.12.23.07.08.13-.22.13-.24-.05-.61-.11-.23.03-.36.08.1.16.11.11-.31.05-.33-.03-.33.02-.22.26-.13.07 0 .12.21.14-.08.37-.11.11-.18.06-.23-.01-.5-.12-.28 0-.14.04-.29.18-.05.11.14.29-.09.14-.06.09.04.18.05.12.04.28-.06.1-.11-.06-.13-.12-.33.06-.17.11-.14-.06.03-.17-.09-.08-.06-.35-.17-.08-.28.01-.3.26-.31.04-.12.05-.13.35-.07.36.04.15.05.07.12.03.8-.14.44.01.48.08.06.08-.2.07-.32.22-.23.3-.19.22-.1.2.38.27.41.21-.22.12-.33.34-.16.27.13.21-.17.22-.36 0-.2.2.44.25.37.12.1.29-.3.19-.43.15-.14.21-1.69-.14-.71.08-.26.06-.28.04.16.21.37.26.14.36 0 .46.61.51.52.37.43.58.21.35.2.47-.05.5.15.53.58.42.25.21.29.18.27.43-.55.65-.5.49-.79.49-.73.22-1.8.37-1.02.14-1.5.13-.78.1-1.52-.02-.96.2-.54 0-.65.05-.85.13-.67.03-.53 0-2.34.55-.44-.01-.33-.03-.54.07-.58-.12-.41-.03-.55-.02-.66.16-.7.06-.83.15-1.01-.04-.3.07-.35.05-.19-.05.23-.22.58-.33-.18-.24-.63.08-.68-.02-.88.06-.65.07-.58.02-.83-.11-.39-.42-1.23-.49-.62-.14-.76-.06-.64-.12-.32.07-.05.24.38.31.13.18.1.23-1.51-.39-.34.03-.19.14.06.35.16.35-.32.23-.65.13-1.27.13-1.38-.27-.5-.06-1.15 0-.51-.13-.91-.16-.79-.04-.9-.12-.61-.19-.71-.34-.48-.15-.39.04-1.36.32-.42.02-.54-.02-.8-.36-.45.01-.72.1-.59-.05-.47.02-.31-.23.5-.41.3-.17 0-.15-.73-.19-.55-.04-.76.02-.23.29-.24.14-.4-.04-.65-.02-.48.21-.25-.03-.32.07.05.31-.35.28-1.07.16-.54-.02-2.36-.29-1.29-.03-1.92.11-.61.16-.58.06-.74-.14-.98-.02-.45-.04-.64.04-.77.12-.6.03-.53-.02-.62-.07-.61-.13-1.15-.18-.38.04-.37-.09-.42-.15-.43-.03-3.52-.05-.98.09-.67-.05-.57-.08-1.12.03-.76.08-.36-.02-.41-.05-.83-.03-.16-.07.26-.09.2-.17-.2-.16-.27-.06-.81-.04-.56.01-.23.11-.35.1.15.28.51.53.36.22.52.08 1.88-.02.53.04.85-.03 1.65.08.91.11 1.08.2.72.17.67.08-.59.07-.39-.02-.44.03-.25.11-.27.05-2.06.09-.59-.01-.31-.05-.4-.08-.61-.06-.53-.03-.45-.05-.82-.03-.86.06-.14.3.21.22.72.09.74.07.85.15.28.16.54.56.2.29.5.04.31.08.77-.11.64-.01.27.07.23.32-.56.35-.45.11.35.09.33.05.69-.03.43.06.97.28 1.06.14.37.11-.19.19-.24.09-.5.02-1.21-.04-1.21.13-.83-.03-.53.09-.74.06-.58-.13-.71-.31-.17-.21-2.34-.02-.76-.05-.67.01-1.05.12-.56-.07-1.01.07-.62-.09-1.09.18-2.68.33-.69-.08-.73.06-1.18-.03-.99-.15-1.24-.11-.99-.04-1.58.03-2.44-.02-.56.06-.23-.19 1.09-.4.95-.25.51-.27.16-.39-.17-.37-.5-.17-.52-.04-.55-.09-.35-.09-.63.03-.36-.05-.38.2.18.26.06.25-.2.15.11.18.33.21-.24.1-.38.01-.66.07-2.02.13-1.1.12-.35.02-.4.06-.39 0 .03-.16.25-.14.18-.44.26-.06.41-.13.58-.23-.27-.13-.41.03-.25-.09.09-.3.31-.05.18-.11-.04-.15-1.84-.36-.61-.05-.36.19-.44.63-.25.4-.26.07-2.66-.09-1.39.06-1.62-.16-1.18-.05-.68.03-.33.06-.48.21-.88.23-.55.07-4.1.21-5.15.05-.93-.08-2.28-.04-2.26.06-1.4-.1-1.85.05-2.36.22-.66.02-1.21.13-.89 0-1.45-.14-1.86-.03-.75-.1-.67.05-1.4.04-1.06.1-.71 0-.7-.05-.77-.12-.82-.18-1.14-.01-1.47.17-.43.15-.52.44-.19.23-.22.05-.97-.02-1.16-.17-3.35.18-1.19.12-1.33.42-.39.09-.52.11-.63.05-.5.06.77.44-.3.01-.27-.01-.82-.12-1.29-.36-.51-.08-1.52.11-1.22.05-1.41.37-1.1.22-.85.1-1.93.02-.74.29-.13.17 1.15.37.48.13.44.18-.54.05-.44-.01-1.56-.19-.48-.05-2.29-.41-1.01-.06-.3.03-.38.11-.33.16-.25.07-.86.09-.81.12.69.12.65.08.97.08 2.77-.12 1.24.15 1.34.33.91.2.16.1-.02.2.12.15-.38.13-.28.03-.08.09.23.06.24.02.42.13.1.08-.26.05-.38.11.03.12.18.02.14.13.11.13-.17.07-.87 0-.7-.03-1.17-.47-.62.06-.51.07-.28.01-.36-.03-1.02-.22-.82-.23-.45.04-.14.17-.01.18.22.13.4.04.66.12.23.1-.4.2-1.73.2-.76.16-.25.13-.29.05-.8-.06-.49-.08-1.43-.35-1.67-.33-.61-.02-2.37.06-.84-.06-.25-.11-.07-.12-.23-.08-.44-.1-1.98-.22-.63-.02-.57.03-1.23-.07-.64.01-.34.07-.66.17-1.03.06-.72-.02-.83-.34-.35.03-.46.14-.07.44.03.31-.26.26-.33.36.2.24.27.14.96.27 1.28.27 1.53-.03 2.69.02.67.06.75-.01.88.09-.53.22-.4.09-2.64.24-.63.11-.57.17.78.24 1.98.48 1.52.18 2.19.16 1.8.03 1-.07.23.03.19.17-.09.11.42.08.58.09.59.16.7.15 1.23.19 3.15.24 1.4.16.52.1.21.18-.1.11-.37 0-.3.05.01.09.2.07.05.15-.29.04-.7.04-1.78 0-.59.02-.82.07-.47.14-.31.31.13.12.52.16.32.06 1.55.17.36.01.11.03.01.14.13.11.36.05.97.04 1.14.17-.22.14-8.58.28-8.53.23-1.33.06-.63.15-.48.2 1.19.13 3.47.29.93.12.56.13.6.16-.23.15-.28.1-.58.12-.58.16 1.83.52 1.92.6-.85.3-.93.18-2.92.42-.68.26-1.26.11-2.16.1-1.1.07-.35.05.2.13.51.02.72.08-.88.25-.59.07-3.83.36-1.05-.11-1.48-.01-3.51.07-.83-.24-.74-.14-.44-.04-1.36.1-.72.11-.85.09-.43-.12-.6-.27-1.54-.16-1.31-.03-3.31.03-.73.02-.3-.03-.49.04-.41-.06-.41-.03-.5-.08-.93-.12-3.49-.34-1.73-.21-.67.03-.58.07-.45-.02-.56.07-.49 0-2.55-.27.14.12.23.12 5.55.66.77.12 4.43.42.84.18.63.18.33.05.65.22.55.12.54.05 1.99-.05 1.59 0 .85-.07 1.28.11 1.91.3.16.16-.25.08-.83.04-.22.05-.18.13.34.08 1.09.18.46.04.14.03-.01.04-.3.07-2.69.04-.13-.01-.12.03.23.06.48.05 1.76.03.48.05.3.05.16.05.Line truncated
data-gid_0="ATA" data-country="Antarctica"/>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 MiB

After

Width:  |  Height:  |  Size: 6.5 MiB

app/src/main/java/net/helcel/beans/activity/adapter/GeolocListAdapter.kt
+52 -22
View File
@@ -13,12 +13,15 @@ import net.helcel.beans.activity.fragment.EditPlaceColorFragment
import net.helcel.beans.activity.fragment.EditPlaceFragment
import net.helcel.beans.countries.GeoLoc
import net.helcel.beans.databinding.ItemListGeolocBinding
import net.helcel.beans.helper.AUTO_GROUP
import net.helcel.beans.helper.Data
import net.helcel.beans.helper.NO_GROUP
import net.helcel.beans.helper.Settings
import net.helcel.beans.helper.Theme.colorWrapper
class GeolocListAdapter(
private val ctx: EditPlaceFragment, private val l: GeoLoc, private val pager: ViewPagerAdapter
private val ctx: EditPlaceFragment, private val l: GeoLoc, private val pager: ViewPagerAdapter,
private val parentHolder: FoldingListViewHolder?
) : RecyclerView.Adapter<GeolocListAdapter.FoldingListViewHolder>() {
override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): FoldingListViewHolder {
@@ -27,7 +30,7 @@ class GeolocListAdapter(
viewGroup,
false
)
return FoldingListViewHolder(ctx.requireActivity(), binding)
return FoldingListViewHolder(ctx.requireActivity(), binding, parentHolder, l)
}
override fun onBindViewHolder(holder: FoldingListViewHolder, position: Int) {
@@ -35,7 +38,7 @@ class GeolocListAdapter(
holder.bind(el)
holder.addListeners(el) {
if (el.children.isNotEmpty())
pager.addFragment(ctx, EditPlaceFragment(el, pager))
pager.addFragment(ctx, EditPlaceFragment(el, pager, holder))
true
}
}
@@ -46,21 +49,13 @@ class GeolocListAdapter(
class FoldingListViewHolder(
private val ctx: FragmentActivity,
private val _binding: ItemListGeolocBinding
private val _binding: ItemListGeolocBinding,
private val _parentHolder: FoldingListViewHolder? = null,
private val _parentGeoLoc: GeoLoc,
) : RecyclerView.ViewHolder(_binding.root) {
private fun bindGroup(el: GeoLoc) {
val numerator = el.children.map { Data.visits.getVisited(it) != 0 }.count { it }
val denominator = el.children.size
_binding.count.text = when (Settings.getStatPref(ctx)) {
ctx.getString(R.string.percentages) -> ctx.getString(
R.string.percentage,
(100 * (numerator.toFloat() / denominator.toFloat())).toInt()
)
else -> ctx.getString(R.string.rate, numerator, denominator)
}
refreshCount(el)
_binding.textView.setTypeface(null, Typeface.BOLD)
_binding.textView.backgroundTintList = ColorStateList.valueOf(
colorWrapper(
@@ -104,16 +99,17 @@ class GeolocListAdapter(
"AddColorDialogFragment"
)
}
_parentHolder?.refresh(_parentGeoLoc)
}
}
fun onColorDialogDismiss(clear: Boolean) {
if (clear) {
Data.visits.setVisited(Data.selected_geoloc, 0)
Data.visits.setVisited(Data.selected_geoloc, NO_GROUP)
Data.saveData()
}
if (Data.selected_group != null && Data.selected_geoloc != null) {
Data.visits.setVisited(Data.selected_geoloc, Data.selected_group?.key ?: 0)
Data.visits.setVisited(Data.selected_geoloc, Data.selected_group?.key ?: NO_GROUP)
Data.saveData()
}
Data.selected_geoloc?.let { refreshCheck(it) }
@@ -122,6 +118,24 @@ class GeolocListAdapter(
}
private fun refreshCheck(geoLoc: GeoLoc) {
_binding.checkBox.checkedState =
if (Data.visits.getVisited(geoLoc) !in listOf(NO_GROUP, AUTO_GROUP)) {
MaterialCheckBox.STATE_CHECKED
}
else if (geoLoc.children.isNotEmpty() && geoLoc.children.all { Data.visits.getVisited(it) != NO_GROUP }) {
Data.visits.setVisited(geoLoc, AUTO_GROUP)
MaterialCheckBox.STATE_CHECKED
}
else if (geoLoc.children.any { Data.visits.getVisited(it) != NO_GROUP }) {
Data.visits.setVisited(geoLoc, AUTO_GROUP)
MaterialCheckBox.STATE_INDETERMINATE
}
else {
Data.visits.setVisited(geoLoc, NO_GROUP)
MaterialCheckBox.STATE_UNCHECKED
}
Data.saveData()
var col = Data.groups.getGroupFromKey(Data.visits.getVisited(geoLoc)).color
if (col.color == Color.TRANSPARENT) {
col = colorWrapper(
@@ -130,13 +144,29 @@ class GeolocListAdapter(
)
col.alpha = 64
}
_binding.checkBox.checkedState =
if (Data.visits.getVisited(geoLoc) != 0) MaterialCheckBox.STATE_CHECKED
else if (geoLoc.children.any { Data.visits.getVisited(it) != 0 }) MaterialCheckBox.STATE_INDETERMINATE
else MaterialCheckBox.STATE_UNCHECKED
_binding.checkBox.buttonTintList = ColorStateList.valueOf(col.color)
}
private fun refreshCount(geoLoc: GeoLoc) {
val numerator = geoLoc.children.map { Data.visits.getVisited(it) != NO_GROUP }.count { it }
val denominator = geoLoc.children.size
_binding.count.text = when (Settings.getStatPref(ctx)) {
ctx.getString(R.string.percentages) -> ctx.getString(
R.string.percentage,
(100 * (numerator.toFloat() / denominator.toFloat())).toInt()
)
else -> ctx.getString(R.string.rate, numerator, denominator)
}
}
private fun refresh(geoLoc: GeoLoc) {
// Refresh
refreshCheck(geoLoc)
refreshCount(geoLoc)
// Recursively refresh parent
_parentHolder?.refresh(_parentGeoLoc)
}
}
}
app/src/main/java/net/helcel/beans/activity/fragment/EditPlaceFragment.kt
+3 -2
View File
@@ -8,11 +8,12 @@ import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import net.helcel.beans.activity.adapter.GeolocListAdapter
import net.helcel.beans.activity.adapter.GeolocListAdapter.FoldingListViewHolder
import net.helcel.beans.activity.adapter.ViewPagerAdapter
import net.helcel.beans.countries.GeoLoc
import net.helcel.beans.databinding.FragmentEditPlacesBinding
class EditPlaceFragment(val loc: GeoLoc, private val pager: ViewPagerAdapter) : Fragment() {
class EditPlaceFragment(val loc: GeoLoc, private val pager: ViewPagerAdapter, private val holder: FoldingListViewHolder? = null) : Fragment() {
private lateinit var _binding: FragmentEditPlacesBinding
override fun onCreateView(
@@ -26,7 +27,7 @@ class EditPlaceFragment(val loc: GeoLoc, private val pager: ViewPagerAdapter) :
_binding.list.setHasFixedSize(true)
_binding.list.layoutManager =
LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
_binding.list.adapter = GeolocListAdapter(this, loc, pager)
_binding.list.adapter = GeolocListAdapter(this, loc, pager, holder)
return _binding.root
}
}
app/src/main/java/net/helcel/beans/activity/fragment/SettingsFragment.kt
+1 -2
View File
@@ -17,8 +17,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
findPreference<Preference>(getString(R.string.key_regional))?.setOnPreferenceChangeListener { _, key ->
when (key as String) {
ctx.getString(R.string.off) -> GeoLocImporter.clearStates()
ctx.getString(R.string.on) -> GeoLocImporter.importStates(ctx)
else -> GeoLocImporter.clearStates()
ctx.getString(R.string.on) -> GeoLocImporter.importStates(ctx, true)
}
true
}
app/src/main/java/net/helcel/beans/countries/Country.kt
+2 -4
View File
@@ -8,8 +8,6 @@ enum class Country(
HKG("Hong Kong", 1104),
MAC("Macao", 32),
ANT("Netherlands Antilles", 800),
AFG("Afghanistan", 645487),
XAD("Akrotiri and Dhekelia", 234),
ALA("Åland", 1483),
@@ -217,7 +215,7 @@ enum class Country(
SLB("Solomon Islands", 28686),
SOM("Somalia", 637672),
ZAF("South Africa", 1224059),
SGS("South Georgia and the South Sand", 4085),
SGS("South Georgia and the South Sandwich Islands", 4085),
KOR("South Korea", 100721),
SSD("South Sudan", 632186),
ESP("Spain", 506617),
@@ -248,7 +246,7 @@ enum class Country(
ARE("United Arab Emirates", 71429),
GBR("United Kingdom", 244732),
USA("United States", 9477483),
UMI("United States Minor Outlying Isl", 47),
UMI("United States Minor Outlying Islands", 47),
URY("Uruguay", 178103),
UZB("Uzbekistan", 447894),
VUT("Vanuatu", 12384),
app/src/main/java/net/helcel/beans/countries/GeoLocImporter.kt
+2 -2
View File
@@ -7,8 +7,8 @@ import java.io.InputStreamReader
object GeoLocImporter {
fun importStates(ctx: Context) {
if (!Settings.isRegional(ctx)) {
fun importStates(ctx: Context, force: Boolean = false) {
if (!Settings.isRegional(ctx) and !force) {
return
}
val fs = BufferedReader(InputStreamReader(ctx.assets.open("geoloc_state.txt")))
app/src/main/java/net/helcel/beans/countries/Group.kt
+20 -20
View File
@@ -6,6 +6,8 @@ enum class Group(override val fullName: String, override val children: List<GeoL
EEE(
"Europe", listOf(
XAD,
ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
ALB,
AND,
AUT,
@@ -18,14 +20,19 @@ enum class Group(override val fullName: String, override val children: List<GeoL
CZE,
DNK,
EST,
FRO, // Faroe Islands: an autonomous region of Denmark
FIN,
FRA,
DEU,
GIB, // Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
GRC,
GGY, // Guernsey: a British Crown dependency in the English Channel
HUN,
ISL,
IRL,
IMN, // Isle of Man: a British Crown dependency located in the Irish Sea
ITA,
JEY, // Jersey: a British Crown dependency located in the English Channel
KAZ,
XKO,
LVA,
@@ -48,12 +55,12 @@ enum class Group(override val fullName: String, override val children: List<GeoL
SVK,
SVN,
ESP,
SJM, // Svalbard and Jan Mayen: an archipelago administered by Norway
SWE,
CHE,
UKR,
GBR,
VAT,
XAD,
)
),
ABB(
@@ -64,9 +71,12 @@ enum class Group(override val fullName: String, override val children: List<GeoL
BHR,
BGD,
BTN,
IOT, // British Indian Ocean Territory: a British overseas territory in the Indian Ocean
BRN,
KHM,
CCK, // Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
CHN,
CXR, // Christmas Island: an Australian external territory in the Indian Ocean
GEO,
HKG,
IND,
@@ -131,8 +141,8 @@ enum class Group(override val fullName: String, override val children: List<GeoL
EGY,
GNQ,
ERI,
SWZ,
ETH,
ATF, // French Southern and Antarctic Lands: a territory of France located in the southern Indian Ocean
GAB,
GMB,
GHA,
@@ -165,6 +175,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
SSD,
SHN,
SDN,
SWZ,
TZA,
TGO,
TUN,
@@ -184,9 +195,11 @@ enum class Group(override val fullName: String, override val children: List<GeoL
BRB,
BLZ,
BMU,
BES, // Bonaire, Sint Eustatius and Saba: special municipalities of the Netherlands in the Caribbean
VGB,
CAN,
CYM,
XCL,
CRI,
CUB,
CUW,
@@ -208,15 +221,18 @@ enum class Group(override val fullName: String, override val children: List<GeoL
NIC,
PAN,
PRI,
BLM, // Saint Barthélemy: an overseas collectivity of France in the Caribbean
KNA,
LCA,
MAF,
SPM,
VCT,
SXM, // Sint Maarten: a constituent country of the Kingdom of the Netherlands in the Caribbean
TTO,
TCA,
USA,
XCL,
UMI, // United States Minor Outlying Islands: a collection of nine insular areas of the United States
VIR, // United States Virgin Islands: an unincorporated territory of the United States in the Caribbean
)
),
SRR(
@@ -257,6 +273,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
PLW,
PNG,
PCN,
WSM, // Samoa: an independent island nation in the South Pacific
SLB,
TKL,
TON,
@@ -269,26 +286,9 @@ enum class Group(override val fullName: String, override val children: List<GeoL
XXX(
"Others", listOf(
ATA, // Antarctica: not in any other region
ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
BES,// Bonaire, Sint Eustatius and Saba: special municipalities of the Netherlands in the Caribbean
BVT, // Bouvet Island: an uninhabited territory of Norway in the South Atlantic
IOT,// British Indian Ocean Territory: a British overseas territory in the Indian Ocean
CXR,// Christmas Island: an Australian external territory in the Indian Ocean
CCK,// Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
FRO,// Faroe Islands: an autonomous region of Denmark
ATF,// French Southern and Antarctic Lands: a territory of France located in the southern Indian Ocean
GIB,// Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
GGY,// Guernsey: a British Crown dependency in the English Channel
HMD, // Heard Island and McDonald Islands: an uninhabited Australian external territory in the southern Indian Ocean
IMN,// Isle of Man: a British Crown dependency located in the Irish Sea
JEY,// Jersey: a British Crown dependency located in the English Channel
BLM,// Saint Barthélemy: an overseas collectivity of France in the Caribbean
WSM, // Samoa: an independent island nation in the South Pacific
SXM, // Sint Maarten: a constituent country of the Kingdom of the Netherlands in the Caribbean
SGS, // South Georgia and the South Sandwich Islands: a British overseas territory in the southern Atlantic Ocean
SJM, // Svalbard and Jan Mayen: an archipelago administered by Norway
UMI, // United States Minor Outlying Islands: a collection of nine insular areas of the United States
VIR, // United States Virgin Islands: an unincorporated territory of the United States in the Caribbean
)
),
app/src/main/java/net/helcel/beans/helper/Data.kt
+1 -1
View File
@@ -34,7 +34,7 @@ fun loadData(ctx: Context, id:Int) {
// Add default group "Visited" with app's color if there is no group already
if (groups.size() == 0) {
groups.setGroup(1, "Visited", ColorDrawable(ContextCompat.getColor(ctx, R.color.blue)))
groups.setGroup(DEFAULT_GROUP, "Visited", ColorDrawable(ContextCompat.getColor(ctx, R.color.blue)))
saveData()
}
app/src/main/java/net/helcel/beans/helper/Groups.kt
+5 -1
View File
@@ -13,6 +13,10 @@ import kotlin.random.Random
private const val randSeed = 0
private val rnd = Random(randSeed)
const val NO_GROUP = 0
const val DEFAULT_GROUP = 1
const val AUTO_GROUP = -1
@Serializable
class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
@@ -30,7 +34,7 @@ class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
fun genKey(): Int {
val key = rnd.nextInt()
if (grps.containsKey(key) || key == 0) return genKey()
if (grps.containsKey(key) || key in listOf(NO_GROUP, DEFAULT_GROUP, AUTO_GROUP)) return genKey()
return key
}
app/src/main/java/net/helcel/beans/helper/Visits.kt
+1 -1
View File
@@ -27,7 +27,7 @@ class Visits(val id: Int, private val locs: HashMap<String, Int>) {
}
fun getVisited(key: GeoLoc): Int {
return locs.getOrDefault(key.code, 0)
return getVisited(key.code)
}
private fun getVisited(key: String): Int {
app/src/main/java/net/helcel/beans/svg/CSSWrapper.kt
+24 -16
View File
@@ -4,47 +4,55 @@ import android.content.Context
import net.helcel.beans.countries.World
import net.helcel.beans.helper.Data.groups
import net.helcel.beans.helper.Data.visits
import net.helcel.beans.helper.Settings
import net.helcel.beans.helper.Theme.colorToHex6
import net.helcel.beans.helper.Theme.colorWrapper
class CSSWrapper(ctx: Context) {
class CSSWrapper(private val ctx: Context) {
private val colorForeground: String =
colorToHex6(colorWrapper(ctx, android.R.attr.panelColorBackground))
private val colorBackground: String =
colorToHex6(colorWrapper(ctx, android.R.attr.colorBackground))
private val baseCSS: String
private val continents: String = World.WWW.children.joinToString(",") { "#${it.code}2" }
private val countries: String = World.WWW.children.joinToString(",") { itt ->
itt.children.joinToString(",") { "#${it.code}2" }
}
private val regional: String = World.WWW.children.joinToString(",") { itt ->
itt.children.joinToString(",") { "#${it.code}1" }
}
private val countryOnlyCSS: String =
"svg{fill:$colorForeground;stroke:$colorBackground;stroke-width:0.1;}" +
"${regional}{display:none;}"
private val countryRegionalCSS: String =
"svg{fill:$colorForeground;stroke:$colorBackground;stroke-width:0.01;}" +
"$continents,$countries{fill:none;stroke:$colorBackground;stroke-width:0.1;}"
private var customCSS: String = ""
init {
val www = World.WWW.children.joinToString(",") { "#${it.code}2" }
val ccc = World.WWW.children.joinToString(",") { itt ->
itt.children.joinToString(",") { "#${it.code}2" }
}
baseCSS = "svg{fill:$colorForeground;stroke:$colorBackground;stroke-width:0.01;}" +
"$www,$ccc{stroke:$colorBackground;stroke-width:0.1;fill:none}"
refresh()
}
fun refresh() {
private fun refresh() {
val id = if (Settings.isRegional(ctx)) "1" else "2"
customCSS = visits.getVisitedByValue().map { (k, v) ->
if (groups.getGroupFromKey(k).key == 0)
""
else
v.joinToString(",") { "#${it}1,#${it}" } + "{fill:${
colorToHex6(
groups.getGroupFromKey(
k
).color
)
v.joinToString(",") { "#${it}$id,#${it}" } + "{fill:${
colorToHex6(groups.getGroupFromKey(k).color)
};}"
}.joinToString("")
}
fun get(): String {
refresh()
return baseCSS + customCSS
return if (Settings.isRegional(ctx)) {
countryRegionalCSS + customCSS
} else {
countryOnlyCSS + customCSS
}
}
}
app/src/main/res/drawable/group.xml
+16
View File
@@ -0,0 +1,16 @@
<vector
android:height="24dp"
android:viewportHeight="24"
android:viewportWidth="24"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android" >
<path android:fillColor="?attr/colorOnBackground" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
<path android:fillColor="?attr/colorPrimary" android:pathData="M8,14m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
<path android:fillColor="?attr/colorPrimary" android:pathData="M12,8m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
<path android:fillColor="?attr/colorPrimary" android:pathData="M16,14m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
</vector>
app/src/main/res/drawable/zoomin.xml
+12
View File
@@ -0,0 +1,12 @@
<vector
android:height="24dp"
android:viewportHeight="24"
android:viewportWidth="24"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android" >
<path android:fillColor="?attr/colorOnBackground" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
<path android:fillColor="?attr/colorPrimary" android:pathData="M12,10h-2v2H9v-2H7V9h2V7h1v2h2v1z"/>
</vector>
app/src/main/res/xml/fragment_settings.xml
+24 -22
View File
@@ -4,23 +4,13 @@
android:theme="@style/Theme.Beans">
<ListPreference
app:defaultValue="@string/off"
app:defaultValue="@string/system"
app:enabled="true"
app:entries="@array/entries_onoff"
app:entryValues="@array/entries_onoff"
app:icon="@drawable/edit"
app:key="@string/key_group"
app:title="@string/key_group"
app:useSimpleSummaryProvider="true" />
<ListPreference
app:defaultValue="@string/off"
app:enabled="true"
app:entries="@array/entries_onoff"
app:entryValues="@array/entries_onoff"
app:icon="@drawable/edit"
app:key="@string/key_regional"
app:title="@string/key_regional"
app:entries="@array/entries_theme"
app:entryValues="@array/entries_theme"
app:icon="@drawable/palette"
app:key="@string/key_theme"
app:title="@string/key_theme"
app:useSimpleSummaryProvider="true" />
<ListPreference
@@ -34,18 +24,30 @@
app:useSimpleSummaryProvider="true" />
<ListPreference
app:defaultValue="@string/system"
app:defaultValue="@string/off"
app:enabled="true"
app:entries="@array/entries_theme"
app:entryValues="@array/entries_theme"
app:icon="@drawable/palette"
app:key="@string/key_theme"
app:title="@string/key_theme"
app:allowDividerAbove="true"
app:entries="@array/entries_onoff"
app:entryValues="@array/entries_onoff"
app:icon="@drawable/group"
app:key="@string/key_group"
app:title="@string/key_group"
app:useSimpleSummaryProvider="true" />
<ListPreference
app:defaultValue="@string/off"
app:enabled="true"
app:entries="@array/entries_onoff"
app:entryValues="@array/entries_onoff"
app:icon="@drawable/zoomin"
app:key="@string/key_regional"
app:title="@string/key_regional"
app:useSimpleSummaryProvider="true" />
<Preference
android:summary="@string/foss_licenses"
app:enabled="true"
app:allowDividerAbove="true"
app:icon="@drawable/licenses"
app:key="@string/licenses"
app:title="@string/licenses" />
yarn.lock
+1992 -3337
View File
File diff suppressed because it is too large. Load diff