Compare commits
11
Commits
0.1a-rc3
...
01dab6aa30
| Author | SHA1 | Date | |
|---|---|---|---|
 fgerber
|
01dab6aa30 | ||
|
fgerber
|
bafd3cea14 | ||
|
fgerber
|
ec52574ae3 | ||
 soraefir
|
923404ebc5
|
||
|
fgerber
|
32ba5e0b07 | ||
|
fgerber
|
72b2148e4b | ||
|
fgerber
|
513660b3a4 | ||
|
soraefir
|
443d62b6df
|
||
|
soraefir
|
a360c7496b
|
||
|
soraefir
|
3fe83cff2e
|
||
 Renovate Bot
|
71acf04f20 |
No files matched your search
@@ -48,17 +48,17 @@ jobs:
|
|||||||
cache: 'gradle'
|
cache: 'gradle'
|
||||||
|
|
||||||
- name: Build APK
|
- name: Build APK
|
||||||
run: ./gradlew assemble
|
run: ./gradlew assembleSignedRelease
|
||||||
|
|
||||||
# - name: Upload APK
|
|
||||||
# uses: actions/upload-artifact@v4
|
|
||||||
# with:
|
|
||||||
# name: app.apk
|
|
||||||
# path: app/build/outputs/apk/release/app-release.apk
|
|
||||||
|
|
||||||
- name: Release
|
- name: Release
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
with:
|
with:
|
||||||
files: |
|
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
|
||||||
+16
-4
@@ -5,9 +5,6 @@ plugins {
|
|||||||
id 'com.mikepenz.aboutlibraries.plugin' version '11.1.1'
|
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 {
|
android {
|
||||||
namespace 'net.helcel.beans'
|
namespace 'net.helcel.beans'
|
||||||
@@ -20,22 +17,37 @@ android {
|
|||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "0.1a"
|
versionName "0.1a"
|
||||||
}
|
}
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
create("release") {
|
create("release") {
|
||||||
|
try {
|
||||||
|
def keystorePropertiesFile = rootProject.file("app/keystore.properties")
|
||||||
|
def keystoreProperties = new Properties()
|
||||||
|
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
|
||||||
|
|
||||||
keyAlias keystoreProperties['keyAlias']
|
keyAlias keystoreProperties['keyAlias']
|
||||||
keyPassword keystoreProperties['keyPassword']
|
keyPassword keystoreProperties['keyPassword']
|
||||||
storeFile file(keystoreProperties['storeFile'])
|
storeFile file(keystoreProperties['storeFile'])
|
||||||
storePassword keystoreProperties['storePassword']
|
storePassword keystoreProperties['storePassword']
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
println("File not found: ${e.message}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
debug {
|
||||||
|
debuggable true
|
||||||
|
}
|
||||||
release {
|
release {
|
||||||
minifyEnabled true
|
minifyEnabled true
|
||||||
shrinkResources false
|
shrinkResources false
|
||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
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")
|
signingConfig = signingConfigs.getByName("release")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1896,7 +1896,7 @@ MAR_FB|MAR|Fès-Boulemane|19366
|
|||||||
MAR_GB|MAR|Gharb-Chrarda-Béni Hssen|8782
|
MAR_GB|MAR|Gharb-Chrarda-Béni Hssen|8782
|
||||||
MAR_GC|MAR|Grand Casablanca|879
|
MAR_GC|MAR|Grand Casablanca|879
|
||||||
MAR_GE|MAR|Guelmim-Es-Semara|64701
|
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_MK|MAR|Marrakech-Tensift-Al Haouz|32483
|
||||||
MAR_MT|MAR|Meknès-Tafilalet|60303
|
MAR_MT|MAR|Meknès-Tafilalet|60303
|
||||||
MAR_OR|MAR|Oriental|59914
|
MAR_OR|MAR|Oriental|59914
|
||||||
@@ -3293,9 +3293,9 @@ ARE_RK|ARE|Ras Al-Khaimah|2442
|
|||||||
ARE_SH|ARE|Sharjah|2529
|
ARE_SH|ARE|Sharjah|2529
|
||||||
ARE_UQ|ARE|Ummal-Qaywayn|746
|
ARE_UQ|ARE|Ummal-Qaywayn|746
|
||||||
GBR_NIR|GBR|Northern Ireland|14134
|
GBR_NIR|GBR|Northern Ireland|14134
|
||||||
GBR_SCT|GBR|Scotland|78704
|
GBR_SCT|GBR|Scotland|79121
|
||||||
GBR_WLS|GBR|Wales|20818
|
GBR_WLS|GBR|Wales|20818
|
||||||
GBR_NA|GBR|NA|130659
|
GBR_NA|GBR|England|130659
|
||||||
USA_AL|USA|Alabama|133995
|
USA_AL|USA|Alabama|133995
|
||||||
USA_AK|USA|Alaska|1501231
|
USA_AK|USA|Alaska|1501231
|
||||||
USA_AZ|USA|Arizona|296082
|
USA_AZ|USA|Arizona|296082
|
||||||
@@ -3532,4 +3532,3 @@ Z05_UT|IND|Uttarakhand|259
|
|||||||
Z09_UT|IND|Uttarakhand|987
|
Z09_UT|IND|Uttarakhand|987
|
||||||
Z06_JK|PAK|Azad Kashmir|13931
|
Z06_JK|PAK|Azad Kashmir|13931
|
||||||
Z06_NA|PAK|Gilgit-Baltistan|68053
|
Z06_NA|PAK|Gilgit-Baltistan|68053
|
||||||
GBR_EN|GBR|England|417
|
|
||||||
@@ -4570,10 +4570,9 @@
|
|||||||
</g>
|
</g>
|
||||||
<g id="GBR1">
|
<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 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 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 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>
|
||||||
<g id="GBR2">
|
<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
|
<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
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 6.5 MiB After Width: | Height: | Size: 6.5 MiB |
@@ -13,12 +13,15 @@ import net.helcel.beans.activity.fragment.EditPlaceColorFragment
|
|||||||
import net.helcel.beans.activity.fragment.EditPlaceFragment
|
import net.helcel.beans.activity.fragment.EditPlaceFragment
|
||||||
import net.helcel.beans.countries.GeoLoc
|
import net.helcel.beans.countries.GeoLoc
|
||||||
import net.helcel.beans.databinding.ItemListGeolocBinding
|
import net.helcel.beans.databinding.ItemListGeolocBinding
|
||||||
|
import net.helcel.beans.helper.AUTO_GROUP
|
||||||
import net.helcel.beans.helper.Data
|
import net.helcel.beans.helper.Data
|
||||||
|
import net.helcel.beans.helper.NO_GROUP
|
||||||
import net.helcel.beans.helper.Settings
|
import net.helcel.beans.helper.Settings
|
||||||
import net.helcel.beans.helper.Theme.colorWrapper
|
import net.helcel.beans.helper.Theme.colorWrapper
|
||||||
|
|
||||||
class GeolocListAdapter(
|
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>() {
|
) : RecyclerView.Adapter<GeolocListAdapter.FoldingListViewHolder>() {
|
||||||
|
|
||||||
override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): FoldingListViewHolder {
|
override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): FoldingListViewHolder {
|
||||||
@@ -27,7 +30,7 @@ class GeolocListAdapter(
|
|||||||
viewGroup,
|
viewGroup,
|
||||||
false
|
false
|
||||||
)
|
)
|
||||||
return FoldingListViewHolder(ctx.requireActivity(), binding)
|
return FoldingListViewHolder(ctx.requireActivity(), binding, parentHolder, l)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onBindViewHolder(holder: FoldingListViewHolder, position: Int) {
|
override fun onBindViewHolder(holder: FoldingListViewHolder, position: Int) {
|
||||||
@@ -35,7 +38,7 @@ class GeolocListAdapter(
|
|||||||
holder.bind(el)
|
holder.bind(el)
|
||||||
holder.addListeners(el) {
|
holder.addListeners(el) {
|
||||||
if (el.children.isNotEmpty())
|
if (el.children.isNotEmpty())
|
||||||
pager.addFragment(ctx, EditPlaceFragment(el, pager))
|
pager.addFragment(ctx, EditPlaceFragment(el, pager, holder))
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -46,21 +49,13 @@ class GeolocListAdapter(
|
|||||||
|
|
||||||
class FoldingListViewHolder(
|
class FoldingListViewHolder(
|
||||||
private val ctx: FragmentActivity,
|
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) {
|
) : RecyclerView.ViewHolder(_binding.root) {
|
||||||
|
|
||||||
private fun bindGroup(el: GeoLoc) {
|
private fun bindGroup(el: GeoLoc) {
|
||||||
val numerator = el.children.map { Data.visits.getVisited(it) != 0 }.count { it }
|
refreshCount(el)
|
||||||
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)
|
|
||||||
}
|
|
||||||
_binding.textView.setTypeface(null, Typeface.BOLD)
|
_binding.textView.setTypeface(null, Typeface.BOLD)
|
||||||
_binding.textView.backgroundTintList = ColorStateList.valueOf(
|
_binding.textView.backgroundTintList = ColorStateList.valueOf(
|
||||||
colorWrapper(
|
colorWrapper(
|
||||||
@@ -104,16 +99,17 @@ class GeolocListAdapter(
|
|||||||
"AddColorDialogFragment"
|
"AddColorDialogFragment"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
_parentHolder?.refresh(_parentGeoLoc)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun onColorDialogDismiss(clear: Boolean) {
|
fun onColorDialogDismiss(clear: Boolean) {
|
||||||
if (clear) {
|
if (clear) {
|
||||||
Data.visits.setVisited(Data.selected_geoloc, 0)
|
Data.visits.setVisited(Data.selected_geoloc, NO_GROUP)
|
||||||
Data.saveData()
|
Data.saveData()
|
||||||
}
|
}
|
||||||
if (Data.selected_group != null && Data.selected_geoloc != null) {
|
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.saveData()
|
||||||
}
|
}
|
||||||
Data.selected_geoloc?.let { refreshCheck(it) }
|
Data.selected_geoloc?.let { refreshCheck(it) }
|
||||||
@@ -122,6 +118,24 @@ class GeolocListAdapter(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun refreshCheck(geoLoc: GeoLoc) {
|
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
|
var col = Data.groups.getGroupFromKey(Data.visits.getVisited(geoLoc)).color
|
||||||
if (col.color == Color.TRANSPARENT) {
|
if (col.color == Color.TRANSPARENT) {
|
||||||
col = colorWrapper(
|
col = colorWrapper(
|
||||||
@@ -130,13 +144,29 @@ class GeolocListAdapter(
|
|||||||
)
|
)
|
||||||
col.alpha = 64
|
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)
|
_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)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,11 +8,12 @@ import androidx.fragment.app.Fragment
|
|||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import net.helcel.beans.activity.adapter.GeolocListAdapter
|
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.activity.adapter.ViewPagerAdapter
|
||||||
import net.helcel.beans.countries.GeoLoc
|
import net.helcel.beans.countries.GeoLoc
|
||||||
import net.helcel.beans.databinding.FragmentEditPlacesBinding
|
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
|
private lateinit var _binding: FragmentEditPlacesBinding
|
||||||
|
|
||||||
override fun onCreateView(
|
override fun onCreateView(
|
||||||
@@ -26,7 +27,7 @@ class EditPlaceFragment(val loc: GeoLoc, private val pager: ViewPagerAdapter) :
|
|||||||
_binding.list.setHasFixedSize(true)
|
_binding.list.setHasFixedSize(true)
|
||||||
_binding.list.layoutManager =
|
_binding.list.layoutManager =
|
||||||
LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
|
LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
|
||||||
_binding.list.adapter = GeolocListAdapter(this, loc, pager)
|
_binding.list.adapter = GeolocListAdapter(this, loc, pager, holder)
|
||||||
return _binding.root
|
return _binding.root
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -17,8 +17,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
|
|||||||
findPreference<Preference>(getString(R.string.key_regional))?.setOnPreferenceChangeListener { _, key ->
|
findPreference<Preference>(getString(R.string.key_regional))?.setOnPreferenceChangeListener { _, key ->
|
||||||
when (key as String) {
|
when (key as String) {
|
||||||
ctx.getString(R.string.off) -> GeoLocImporter.clearStates()
|
ctx.getString(R.string.off) -> GeoLocImporter.clearStates()
|
||||||
ctx.getString(R.string.on) -> GeoLocImporter.importStates(ctx)
|
ctx.getString(R.string.on) -> GeoLocImporter.importStates(ctx, true)
|
||||||
else -> GeoLocImporter.clearStates()
|
|
||||||
}
|
}
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,8 +8,6 @@ enum class Country(
|
|||||||
HKG("Hong Kong", 1104),
|
HKG("Hong Kong", 1104),
|
||||||
MAC("Macao", 32),
|
MAC("Macao", 32),
|
||||||
ANT("Netherlands Antilles", 800),
|
ANT("Netherlands Antilles", 800),
|
||||||
|
|
||||||
|
|
||||||
AFG("Afghanistan", 645487),
|
AFG("Afghanistan", 645487),
|
||||||
XAD("Akrotiri and Dhekelia", 234),
|
XAD("Akrotiri and Dhekelia", 234),
|
||||||
ALA("Åland", 1483),
|
ALA("Åland", 1483),
|
||||||
@@ -217,7 +215,7 @@ enum class Country(
|
|||||||
SLB("Solomon Islands", 28686),
|
SLB("Solomon Islands", 28686),
|
||||||
SOM("Somalia", 637672),
|
SOM("Somalia", 637672),
|
||||||
ZAF("South Africa", 1224059),
|
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),
|
KOR("South Korea", 100721),
|
||||||
SSD("South Sudan", 632186),
|
SSD("South Sudan", 632186),
|
||||||
ESP("Spain", 506617),
|
ESP("Spain", 506617),
|
||||||
@@ -248,7 +246,7 @@ enum class Country(
|
|||||||
ARE("United Arab Emirates", 71429),
|
ARE("United Arab Emirates", 71429),
|
||||||
GBR("United Kingdom", 244732),
|
GBR("United Kingdom", 244732),
|
||||||
USA("United States", 9477483),
|
USA("United States", 9477483),
|
||||||
UMI("United States Minor Outlying Isl", 47),
|
UMI("United States Minor Outlying Islands", 47),
|
||||||
URY("Uruguay", 178103),
|
URY("Uruguay", 178103),
|
||||||
UZB("Uzbekistan", 447894),
|
UZB("Uzbekistan", 447894),
|
||||||
VUT("Vanuatu", 12384),
|
VUT("Vanuatu", 12384),
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import java.io.InputStreamReader
|
|||||||
|
|
||||||
object GeoLocImporter {
|
object GeoLocImporter {
|
||||||
|
|
||||||
fun importStates(ctx: Context) {
|
fun importStates(ctx: Context, force: Boolean = false) {
|
||||||
if (!Settings.isRegional(ctx)) {
|
if (!Settings.isRegional(ctx) and !force) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
val fs = BufferedReader(InputStreamReader(ctx.assets.open("geoloc_state.txt")))
|
val fs = BufferedReader(InputStreamReader(ctx.assets.open("geoloc_state.txt")))
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ enum class Group(override val fullName: String, override val children: List<GeoL
|
|||||||
|
|
||||||
EEE(
|
EEE(
|
||||||
"Europe", listOf(
|
"Europe", listOf(
|
||||||
|
XAD,
|
||||||
|
ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
|
||||||
ALB,
|
ALB,
|
||||||
AND,
|
AND,
|
||||||
AUT,
|
AUT,
|
||||||
@@ -18,14 +20,19 @@ enum class Group(override val fullName: String, override val children: List<GeoL
|
|||||||
CZE,
|
CZE,
|
||||||
DNK,
|
DNK,
|
||||||
EST,
|
EST,
|
||||||
|
FRO, // Faroe Islands: an autonomous region of Denmark
|
||||||
FIN,
|
FIN,
|
||||||
FRA,
|
FRA,
|
||||||
DEU,
|
DEU,
|
||||||
|
GIB, // Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
|
||||||
GRC,
|
GRC,
|
||||||
|
GGY, // Guernsey: a British Crown dependency in the English Channel
|
||||||
HUN,
|
HUN,
|
||||||
ISL,
|
ISL,
|
||||||
IRL,
|
IRL,
|
||||||
|
IMN, // Isle of Man: a British Crown dependency located in the Irish Sea
|
||||||
ITA,
|
ITA,
|
||||||
|
JEY, // Jersey: a British Crown dependency located in the English Channel
|
||||||
KAZ,
|
KAZ,
|
||||||
XKO,
|
XKO,
|
||||||
LVA,
|
LVA,
|
||||||
@@ -48,12 +55,12 @@ enum class Group(override val fullName: String, override val children: List<GeoL
|
|||||||
SVK,
|
SVK,
|
||||||
SVN,
|
SVN,
|
||||||
ESP,
|
ESP,
|
||||||
|
SJM, // Svalbard and Jan Mayen: an archipelago administered by Norway
|
||||||
SWE,
|
SWE,
|
||||||
CHE,
|
CHE,
|
||||||
UKR,
|
UKR,
|
||||||
GBR,
|
GBR,
|
||||||
VAT,
|
VAT,
|
||||||
XAD,
|
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
ABB(
|
ABB(
|
||||||
@@ -64,9 +71,12 @@ enum class Group(override val fullName: String, override val children: List<GeoL
|
|||||||
BHR,
|
BHR,
|
||||||
BGD,
|
BGD,
|
||||||
BTN,
|
BTN,
|
||||||
|
IOT, // British Indian Ocean Territory: a British overseas territory in the Indian Ocean
|
||||||
BRN,
|
BRN,
|
||||||
KHM,
|
KHM,
|
||||||
|
CCK, // Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
|
||||||
CHN,
|
CHN,
|
||||||
|
CXR, // Christmas Island: an Australian external territory in the Indian Ocean
|
||||||
GEO,
|
GEO,
|
||||||
HKG,
|
HKG,
|
||||||
IND,
|
IND,
|
||||||
@@ -131,8 +141,8 @@ enum class Group(override val fullName: String, override val children: List<GeoL
|
|||||||
EGY,
|
EGY,
|
||||||
GNQ,
|
GNQ,
|
||||||
ERI,
|
ERI,
|
||||||
SWZ,
|
|
||||||
ETH,
|
ETH,
|
||||||
|
ATF, // French Southern and Antarctic Lands: a territory of France located in the southern Indian Ocean
|
||||||
GAB,
|
GAB,
|
||||||
GMB,
|
GMB,
|
||||||
GHA,
|
GHA,
|
||||||
@@ -165,6 +175,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
|
|||||||
SSD,
|
SSD,
|
||||||
SHN,
|
SHN,
|
||||||
SDN,
|
SDN,
|
||||||
|
SWZ,
|
||||||
TZA,
|
TZA,
|
||||||
TGO,
|
TGO,
|
||||||
TUN,
|
TUN,
|
||||||
@@ -184,9 +195,11 @@ enum class Group(override val fullName: String, override val children: List<GeoL
|
|||||||
BRB,
|
BRB,
|
||||||
BLZ,
|
BLZ,
|
||||||
BMU,
|
BMU,
|
||||||
|
BES, // Bonaire, Sint Eustatius and Saba: special municipalities of the Netherlands in the Caribbean
|
||||||
VGB,
|
VGB,
|
||||||
CAN,
|
CAN,
|
||||||
CYM,
|
CYM,
|
||||||
|
XCL,
|
||||||
CRI,
|
CRI,
|
||||||
CUB,
|
CUB,
|
||||||
CUW,
|
CUW,
|
||||||
@@ -208,15 +221,18 @@ enum class Group(override val fullName: String, override val children: List<GeoL
|
|||||||
NIC,
|
NIC,
|
||||||
PAN,
|
PAN,
|
||||||
PRI,
|
PRI,
|
||||||
|
BLM, // Saint Barthélemy: an overseas collectivity of France in the Caribbean
|
||||||
KNA,
|
KNA,
|
||||||
LCA,
|
LCA,
|
||||||
MAF,
|
MAF,
|
||||||
SPM,
|
SPM,
|
||||||
VCT,
|
VCT,
|
||||||
|
SXM, // Sint Maarten: a constituent country of the Kingdom of the Netherlands in the Caribbean
|
||||||
TTO,
|
TTO,
|
||||||
TCA,
|
TCA,
|
||||||
USA,
|
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(
|
SRR(
|
||||||
@@ -257,6 +273,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
|
|||||||
PLW,
|
PLW,
|
||||||
PNG,
|
PNG,
|
||||||
PCN,
|
PCN,
|
||||||
|
WSM, // Samoa: an independent island nation in the South Pacific
|
||||||
SLB,
|
SLB,
|
||||||
TKL,
|
TKL,
|
||||||
TON,
|
TON,
|
||||||
@@ -269,26 +286,9 @@ enum class Group(override val fullName: String, override val children: List<GeoL
|
|||||||
XXX(
|
XXX(
|
||||||
"Others", listOf(
|
"Others", listOf(
|
||||||
ATA, // Antarctica: not in any other region
|
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
|
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
|
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
|
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
|
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ fun loadData(ctx: Context, id:Int) {
|
|||||||
|
|
||||||
// Add default group "Visited" with app's color if there is no group already
|
// Add default group "Visited" with app's color if there is no group already
|
||||||
if (groups.size() == 0) {
|
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()
|
saveData()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,10 @@ import kotlin.random.Random
|
|||||||
private const val randSeed = 0
|
private const val randSeed = 0
|
||||||
private val rnd = Random(randSeed)
|
private val rnd = Random(randSeed)
|
||||||
|
|
||||||
|
const val NO_GROUP = 0
|
||||||
|
const val DEFAULT_GROUP = 1
|
||||||
|
const val AUTO_GROUP = -1
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
|
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 {
|
fun genKey(): Int {
|
||||||
val key = rnd.nextInt()
|
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
|
return key
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class Visits(val id: Int, private val locs: HashMap<String, Int>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun getVisited(key: GeoLoc): Int {
|
fun getVisited(key: GeoLoc): Int {
|
||||||
return locs.getOrDefault(key.code, 0)
|
return getVisited(key.code)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getVisited(key: String): Int {
|
private fun getVisited(key: String): Int {
|
||||||
|
|||||||
@@ -4,47 +4,55 @@ import android.content.Context
|
|||||||
import net.helcel.beans.countries.World
|
import net.helcel.beans.countries.World
|
||||||
import net.helcel.beans.helper.Data.groups
|
import net.helcel.beans.helper.Data.groups
|
||||||
import net.helcel.beans.helper.Data.visits
|
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.colorToHex6
|
||||||
import net.helcel.beans.helper.Theme.colorWrapper
|
import net.helcel.beans.helper.Theme.colorWrapper
|
||||||
|
|
||||||
class CSSWrapper(ctx: Context) {
|
class CSSWrapper(private val ctx: Context) {
|
||||||
|
|
||||||
private val colorForeground: String =
|
private val colorForeground: String =
|
||||||
colorToHex6(colorWrapper(ctx, android.R.attr.panelColorBackground))
|
colorToHex6(colorWrapper(ctx, android.R.attr.panelColorBackground))
|
||||||
private val colorBackground: String =
|
private val colorBackground: String =
|
||||||
colorToHex6(colorWrapper(ctx, android.R.attr.colorBackground))
|
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 = ""
|
private var customCSS: String = ""
|
||||||
|
|
||||||
init {
|
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()
|
refresh()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun refresh() {
|
private fun refresh() {
|
||||||
|
val id = if (Settings.isRegional(ctx)) "1" else "2"
|
||||||
customCSS = visits.getVisitedByValue().map { (k, v) ->
|
customCSS = visits.getVisitedByValue().map { (k, v) ->
|
||||||
if (groups.getGroupFromKey(k).key == 0)
|
if (groups.getGroupFromKey(k).key == 0)
|
||||||
""
|
""
|
||||||
else
|
else
|
||||||
v.joinToString(",") { "#${it}1,#${it}" } + "{fill:${
|
v.joinToString(",") { "#${it}$id,#${it}" } + "{fill:${
|
||||||
colorToHex6(
|
colorToHex6(groups.getGroupFromKey(k).color)
|
||||||
groups.getGroupFromKey(
|
|
||||||
k
|
|
||||||
).color
|
|
||||||
)
|
|
||||||
};}"
|
};}"
|
||||||
}.joinToString("")
|
}.joinToString("")
|
||||||
}
|
}
|
||||||
|
|
||||||
fun get(): String {
|
fun get(): String {
|
||||||
refresh()
|
refresh()
|
||||||
return baseCSS + customCSS
|
return if (Settings.isRegional(ctx)) {
|
||||||
|
countryRegionalCSS + customCSS
|
||||||
|
} else {
|
||||||
|
countryOnlyCSS + customCSS
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user