Repair edit fragment refresh when groups are active

.github/workflows/build.yml

@@ -48,17 +48,17 @@ jobs:
           cache: 'gradle'
 
       - 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
         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

@@ -5,6 +5,7 @@ plugins {
     id 'com.mikepenz.aboutlibraries.plugin' version '11.1.1'
 }
 
+
 android {
     namespace 'net.helcel.beans'
     compileSdk 34
@@ -16,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")
         }
     }
@@ -71,6 +87,5 @@ dependencies {
 
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation "com.github.AppDevNext:AndroidChart:3.1.0.21"
     implementation 'com.mikepenz:aboutlibraries:11.1.1'
 }

app/src/main/assets/geoloc_state.txt

@@ -32,7 +32,8 @@ AFG_TK|AFG|Takhar|12361
 AFG_OZ|AFG|Uruzgan|12900
 AFG_VR|AFG|Wardak|8945
 AFG_ZB|AFG|Zabul|17375
-XAD_NA|XAD|Dhekelia|125
+XAD_Akrotiri|XAD|Akrotiri|109
+XAD_Dhekelia|XAD|Dhekelia|125
 ALA_AR|ALA|Archipelago|448
 ALA_CO|ALA|Countryside|1022
 ALA_MH|ALA|Mariehamn|13
@@ -126,14 +127,17 @@ AGO_NA|AGO|Namibe|58240
 AGO_UI|AGO|Uíge|62425
 AGO_ZA|AGO|Zaire|36821
 AIA_BP|AIA|Blowing Point|5
-AIA_NA|AIA|Sombrero Island|0
+AIA_DogIsland|AIA|Dog Island|2
 AIA_EE|AIA|East End|5
 AIA_GH|AIA|George Hill|7
 AIA_IH|AIA|Island Harbour|6
 AIA_NH|AIA|North Hill|1
 AIA_NS|AIA|North Side|9
+AIA_PriclyPearCays|AIA|Pricly Pear Cays|0
 AIA_SG|AIA|Sandy Ground|1
 AIA_SH|AIA|Sandy Hill|7
+AIA_ScrubIsland|AIA|Scrub Island|4
+AIA_SombreroIsland|AIA|Sombrero Island|0
 AIA_SO|AIA|South Hill|7
 AIA_ST|AIA|Stoney Ground|7
 AIA_TF|AIA|The Farrington|5
@@ -203,8 +207,16 @@ AUT_ST|AUT|Steiermark|16408
 AUT_TR|AUT|Tirol|12646
 AUT_VO|AUT|Vorarlberg|2602
 AUT_WI|AUT|Wien|415
-AZE_NA|AZE|Yukhari-Karabakh|7407
+AZE_Absheron|AZE|Absheron|6147
+AZE_Aran|AZE|Aran|21914
+AZE_Daglig-Shirvan|AZE|Daglig-Shirvan|5989
+AZE_Ganja-Qazakh|AZE|Ganja-Qazakh|12044
+AZE_Kalbajar-Lachin|AZE|Kalbajar-Lachin|5770
 AZE_LA|AZE|Lankaran|5592
+AZE_Nakhchivan|AZE|Nakhchivan|5400
+AZE_Quba-Khachmaz|AZE|Quba-Khachmaz|7339
+AZE_Shaki-Zaqatala|AZE|Shaki-Zaqatala|8729
+AZE_Yukhari-Karabakh|AZE|Yukhari-Karabakh|7407
 BHS_AK|BHS|Acklins|496
 BHS_BR|BHS|Berry Islands|61
 BHS_BI|BHS|Biminis|34
@@ -266,7 +278,9 @@ BLR_HR|BLR|Grodno|24952
 BLR_MI|BLR|Minsk|2255
 BLR_MA|BLR|Mogilev|28984
 BLR_VI|BLR|Vitebsk|40056
-BEL_NA|BEL|Wallonie|16827
+BEL_Bruxelles|BEL|Bruxelles|156
+BEL_Vlaanderen|BEL|Vlaanderen|13685
+BEL_Wallonie|BEL|Wallonie|16827
 BLZ_BZ|BLZ|Belize|3372
 BLZ_CY|BLZ|Cayo|5322
 BLZ_CZ|BLZ|Corozal|2012
@@ -374,7 +388,11 @@ BRA_SC|BRA|Santa Catarina|96032
 BRA_SP|BRA|São Paulo|249417
 BRA_SE|BRA|Sergipe|22079
 BRA_TO|BRA|Tocantins|279170
-VGB_NA|VGB|Virgin Gorda|28
+VGB_Anegada|VGB|Anegada|40
+VGB_JostVanDyke|VGB|Jost Van Dyke|11
+VGB_OtherIslands|VGB|Other Islands|14
+VGB_Tortola|VGB|Tortola|76
+VGB_VirginGorda|VGB|Virgin Gorda|28
 BRN_BE|BRN|Belait|2863
 BRN_BM|BRN|Brunei and Muara|533
 BRN_TE|BRN|Temburong|1283
@@ -636,7 +654,17 @@ COL_VD|COL|Vichada|100014
 COM_MO|COM|Mwali|220
 COM_GC|COM|Njazídja|1028
 COM_AN|COM|Nzwani|436
-COK_NA|COK|Rarotonga|70
+COK_Aitutaki|COK|Aitutaki|28
+COK_Atiu|COK|Atiu|31
+COK_Mangaia|COK|Mangaia|49
+COK_Manihiki|COK|Manihiki|8
+COK_Mauke|COK|Mauke|20
+COK_Mitiaro|COK|Mitiaro|25
+COK_Palmerston|COK|Palmerston|24
+COK_Penhryn|COK|Penhryn|17
+COK_Pukapuka|COK|Pukapuka|6
+COK_Rakahanga|COK|Rakahanga|5
+COK_Rarotonga|COK|Rarotonga|70
 CRI_AL|CRI|Alajuela|9834
 CRI_CA|CRI|Cartago|3113
 CRI_GU|CRI|Guanacaste|10250
@@ -878,7 +906,7 @@ EST_JN|EST|Jõgeva|2597
 EST_LN|EST|Lääne|2420
 EST_LV|EST|Lääne-Viru|3478
 EST_PR|EST|Pärnu|4796
-EST_NA|EST|Peipsi|1758
+EST_Peipsi|EST|Peipsi|1758
 EST_PL|EST|Põlva|2161
 EST_RA|EST|Rapla|2971
 EST_SA|EST|Saare|2932
@@ -934,7 +962,7 @@ PYF_MI|PYF|Îles Marquises|996
 PYF_LI|PYF|Îles Sous-le-Vent|429
 PYF_TG|PYF|Îles Tuamotu-Gambier|1039
 ATF_CR|ATF|Îles Crozet|372
-ATF_NA|ATF|ÎlesÉparses|44
+ATF_ÎlesÉparses|ATF|Îles Éparses|44
 ATF_AS|ATF|Îles Saint Paulet Amsterdam|64
 ATF_KG|ATF|Kerguelen|7372
 GAB_ES|GAB|Estuaire|20024
@@ -1071,9 +1099,14 @@ GGY_SV|GGY|Saint Saviour|6
 GGY_SK|GGY|Sark|7
 GGY_TV|GGY|Torteval|3
 GGY_VA|GGY|Vale|10
-GIN_NA|GIN|Nzérékoré|36751
+GIN_Boké|GIN|Boké|34287
 GIN_C|GIN|Conakry|423
+GIN_Faranah|GIN|Faranah|35989
 GIN_K|GIN|Kankan|72197
+GIN_Kindia|GIN|Kindia|25816
+GIN_Labé|GIN|Labé|22959
+GIN_Mamou|GIN|Mamou|17935
+GIN_Nzérékoré|GIN|Nzérékoré|36751
 GNB_BA|GNB|Bafatá|5881
 GNB_BM|GNB|Biombo|761
 GNB_BS|GNB|Bissau|83
@@ -1298,7 +1331,7 @@ IMN_MC|IMN|Michael|34
 IMN_MD|IMN|Santon|16
 IMN_GR|IMN|Garff|72
 IMN_GB|IMN|Peel|2
-ISR_NA|ISR|Golan|1238
+ISR_Golan|ISR|Golan|1238
 ISR_HD|ISR|Ha Darom|14557
 ISR_HA|ISR|Haifa|887
 ISR_HM|ISR|Ha Merkaz|1243
@@ -1471,10 +1504,13 @@ KEN_UG|KEN|Uasin Gishu|3453
 KEN_VI|KEN|Vihiga|562
 KEN_WJ|KEN|Wajir|57017
 KEN_WP|KEN|West Pokot|9574
-XKO_NA|XKO|Uroševac|1056
+XKO_Đakovica|XKO|Đakovica|1109
+XKO_Gnjilane|XKO|Gnjilane|1360
 XKO_KM|XKO|Kosovska Mitrovica|2070
 XKO_PE|XKO|Pećki|1357
+XKO_Pristina|XKO|Pristina|2175
 XKO_PZ|XKO|Prizren|1715
+XKO_Uroševac|XKO|Uroševac|1056
 KWT_AH|KWT|Al Ahmadi|4659
 KWT_FA|KWT|Al Farwaniyah|219
 KWT_JA|KWT|Al Jahrah|12438
@@ -1512,7 +1548,14 @@ LVA_L|LVA|Latgale|14678
 LVA_R|LVA|Riga|10324
 LVA_V|LVA|Vidzeme|15240
 LVA_Z|LVA|Zemgale|10775
-LBN_NA|LBN|South|919
+LBN_Akkar|LBN|Akkar|793
+LBN_Baalbak-Hermel|LBN|Baalbak-Hermel|2854
+LBN_Beirut|LBN|Beirut|21
+LBN_Bekaa|LBN|Bekaa|1408
+LBN_MountLebanon|LBN|Mount Lebanon|1990
+LBN_Nabatiyeh|LBN|Nabatiyeh|1099
+LBN_North|LBN|North|1181
+LBN_South|LBN|South|919
 LSO_BE|LSO|Berea|1999
 LSO_BB|LSO|Butha-Buthe|1796
 LSO_LE|LSO|Leribe|2829
@@ -1624,7 +1667,7 @@ MKD_KZ|MKD|Kriva Palanka|508
 MKD_KG|MKD|Krivogaštani|95
 MKD_KS|MKD|Kruševo|183
 MKD_UM|MKD|Kumanovo|503
-MKD_NA|MKD|Staro Nagoričane|438
+MKD_LakeOhrid|MKD|Lake Ohrid|247
 MKD_LI|MKD|Lipkovo|265
 MKD_LO|MKD|Lozovo|161
 MKD_MK|MKD|Makedonska Kamenica|198
@@ -1647,6 +1690,7 @@ MKD_RM|MKD|Rosoman|133
 MKD_AJ|MKD|Saraj|234
 MKD_SS|MKD|Sopište|214
 MKD_SD|MKD|Star Dojran|150
+MKD_NA|MKD|Staro Nagoričane|438
 MKD_ST|MKD|Štip|565
 MKD_UG|MKD|Struga|475
 MKD_RU|MKD|Strumitsa|320
@@ -1669,7 +1713,7 @@ MDG_D|MDG|Antsiranana|44120
 MDG_F|MDG|Fianarantsoa|101276
 MDG_M|MDG|Mahajanga|152526
 MDG_A|MDG|Toamasina|71636
-MDG_NA|MDG|Toliary|164809
+MDG_Toliary|MDG|Toliary|164809
 MWI_BA|MWI|Balaka|2143
 MWI_BL|MWI|Blantyre|2038
 MWI_CK|MWI|Chikwawa|4908
@@ -1728,9 +1772,29 @@ MLT_GO|MLT|Għawdex|71
 MLT_SO|MLT|Nofsinhar|78
 MLT_NO|MLT|Tramuntana|116
 MLT_SE|MLT|Xlokk|36
-MHL_NA|MHL|NA|26
+MHL_Ailinglaplap|MHL|Ailinglaplap|18
+MHL_Ailuk|MHL|Ailuk|11
+MHL_Arno|MHL|Arno|28
+MHL_Aur|MHL|Aur|6
+MHL_Ebon|MHL|Ebon|8
+MHL_Enewetok|MHL|Enewetok|16
+MHL_Jabat|MHL|Jabat|1
+MHL_Jaluit|MHL|Jaluit|13
 MHL_KWA|MHL|Kwajalein|27
+MHL_Lae|MHL|Lae|3
+MHL_Lib|MHL|Lib|1
+MHL_Likiep|MHL|Likiep|13
 MHL_MAJ|MHL|Majuro|22
+MHL_Maloelap|MHL|Maloelap|12
+MHL_Mejit|MHL|Mejit|4
+MHL_Mili|MHL|Mili|27
+MHL_Namorik|MHL|Namorik|5
+MHL_Namu|MHL|Namu|7
+MHL_Ujae|MHL|Ujae|3
+MHL_Utirik|MHL|Utirik|14
+MHL_Wotho|MHL|Wotho|6
+MHL_Wotje|MHL|Wotje|15
+MHL_19_1|MHL|NA|26
 MTQ_FF|MTQ|Fort-de-France|189
 MTQ_MA|MTQ|Le Marin|393
 MTQ_TR|MTQ|Le Trinité|353
@@ -1896,7 +1960,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
@@ -1968,13 +2032,15 @@ NLD_FL|NLD|Flevoland|1466
 NLD_FR|NLD|Fryslân|3573
 NLD_GE|NLD|Gelderland|5102
 NLD_GR|NLD|Groningen|2370
-NLD_SH|NLD|Zuid-Holland|3143
+NLD_IJsselmeer|NLD|IJsselmeer|1995
 NLD_LI|NLD|Limburg|2159
 NLD_NB|NLD|Noord-Brabant|5082
 NLD_NH|NLD|Noord-Holland|2872
 NLD_OV|NLD|Overijssel|3369
 NLD_UT|NLD|Utrecht|1555
 NLD_ZE|NLD|Zeeland|1804
+NLD_Zeeuwsemeren|NLD|Zeeuwsemeren|477
+NLD_14_1|NLD|NA|3143
 NCL_IL|NCL|Îles Loyauté|1988
 NCL_NO|NCL|Nord|9520
 NCL_SU|NCL|Sud|7408
@@ -2067,13 +2133,18 @@ PRK_WB|PRK|Hwanghae-bukto|8248
 PRK_WN|PRK|Hwanghae-namdo|8563
 PRK_KS|PRK|Kaesŏng|1182
 PRK_KW|PRK|Kangwŏn-do|10286
-PRK_NA|PRK|Sinŭiju|109
+PRK_Kumgangsan|PRK|Kumgangsan|987
 PRK_PB|PRK|P'yŏngan-bukto|12424
 PRK_PN|PRK|P'yŏngan-namdo|12479
 PRK_PY|PRK|P'yŏngyang|2718
 PRK_NJ|PRK|Rasŏn|856
 PRK_YG|PRK|Ryanggang|13935
-ZNC_NA|ZNC|Nicosia|522
+PRK_Sinŭiju|PRK|Sinŭiju|109
+ZNC_Gazimağusa|ZNC|Gazimağusa|927
+ZNC_Girne|ZNC|Girne|677
+ZNC_Güzelyurt|ZNC|Güzelyurt|346
+ZNC_Iskele|ZNC|Iskele|849
+ZNC_Nicosia|ZNC|Nicosia|522
 MNP_NI|MNP|Northern Islands|181
 MNP_RO|MNP|Rota|90
 MNP_SA|MNP|Saipan|123
@@ -2318,7 +2389,7 @@ PRT_FA|PRT|Faro|4975
 PRT_GU|PRT|Guarda|5541
 PRT_LE|PRT|Leiria|3501
 PRT_LI|PRT|Lisboa|2765
-PRT_NA|PRT|Madeira|801
+PRT_Madeira|PRT|Madeira|801
 PRT_PA|PRT|Portalegre|6091
 PRT_PO|PRT|Porto|2332
 PRT_SA|PRT|Santarém|6725
@@ -2511,7 +2582,7 @@ RUS_LP|RUS|Lipetsk|24425
 RUS_MG|RUS|Magadan|459480
 RUS_ME|RUS|Mariy-El|23468
 RUS_MR|RUS|Mordovia|26161
-RUS_NA|RUS|Moscow City|1095
+RUS_MoscowCity|RUS|Moscow City|1095
 RUS_MS|RUS|Moskva|46592
 RUS_MM|RUS|Murmansk|142851
 RUS_NN|RUS|Nenets|175502
@@ -2557,7 +2628,8 @@ RWA_SU|RWA|Amajyepfo|5997
 RWA_ES|RWA|Iburasirazuba|9530
 RWA_OU|RWA|Iburengerazuba|5910
 RWA_KV|RWA|Umujyiwa Kigali|733
-BLM_NA|BLM|Sousle Vent|8
+BLM_AuVent|BLM|Au Vent|13
+BLM_SousleVent|BLM|Sous le Vent|8
 SHN_AC|SHN|Ascension|100
 SHN_SH|SHN|Saint Helena|124
 SHN_TA|SHN|Tristanda Cunha|189
@@ -2697,7 +2769,11 @@ SLE_EA|SLE|Eastern|15846
 SLE_NO|SLE|Northern|36238
 SLE_SO|SLE|Southern|20261
 SLE_WE|SLE|Western|722
-SGP_NA|SGP|West|230
+SGP_Central|SGP|Central|133
+SGP_East|SGP|East|103
+SGP_North|SGP|North|131
+SGP_North-East|SGP|North-East|103
+SGP_West|SGP|West|230
 SVK_BC|SVK|Banskobystrický|9565
 SVK_BL|SVK|Bratislavský|2015
 SVK_KI|SVK|Košický|6768
@@ -2708,7 +2784,7 @@ SVK_TA|SVK|Trnavský|4125
 SVK_ZI|SVK|Žilinský|6828
 SVN_GO|SVN|Gorenjska|2117
 SVN_SP|SVN|Goriška|2277
-SVN_NA|SVN|Jugovzhodna Slovenija|2635
+SVN_JugovzhodnaSlovenija|SVN|Jugovzhodna Slovenija|2635
 SVN_KO|SVN|Koroška|1032
 SVN_NO|SVN|Notranjsko-kraška|1452
 SVN_JP|SVN|Obalno-kraška|945
@@ -3191,7 +3267,12 @@ TKM_BA|TKM|Balkan|136605
 TKM_DA|TKM|Daşoguz|76751
 TKM_LE|TKM|Lebap|96478
 TKM_MA|TKM|Mary|86353
-TCA_NA|TCA|South Caicosand East Caicos|247
+TCA_GrandTurk|TCA|Grand Turk|20
+TCA_MiddleCaicos|TCA|Middle Caicos|306
+TCA_NorthCaicos|TCA|North Caicos|259
+TCA_ProvidencialesandWestCaicos|TCA|Providenciales and West Caicos|152
+TCA_SaltCay|TCA|Salt Cay|11
+TCA_SouthCaicosandEastCaicos|TCA|South Caicos and East Caicos|247
 TUV_FN|TUV|Funafuti|7
 TUV_NG|TUV|Nanumanga|3
 TUV_NA|TUV|Nanumea|4
@@ -3231,7 +3312,8 @@ UGA_TG|UGA|Kitgum|9621
 UGA_KF|UGA|Kotido|13366
 UGA_KU|UGA|Kumi|2867
 UGA_KJ|UGA|Kyenjojo|4125
-UGA_NA|UGA|Nakasongola|3536
+UGA_LakeAlbert|UGA|Lake Albert|3212
+UGA_LakeVictoria|UGA|Lake Victoria|28585
 UGA_LA|UGA|Lira|7285
 UGA_LW|UGA|Luwero|5734
 UGA_MA|UGA|Masaka|3643
@@ -3245,6 +3327,7 @@ UGA_MI|UGA|Mpigi|3321
 UGA_MD|UGA|Mubende|6242
 UGA_MN|UGA|Mukono|3434
 UGA_NP|UGA|Nakapiripirit|5859
+UGA_NA|UGA|Nakasongola|3536
 UGA_NE|UGA|Nebbi|2910
 UGA_NT|UGA|Ntungamo|2068
 UGA_PD|UGA|Pader|6905
@@ -3295,7 +3378,7 @@ ARE_UQ|ARE|Ummal-Qaywayn|746
 GBR_NIR|GBR|Northern Ireland|14134
 GBR_SCT|GBR|Scotland|78704
 GBR_WLS|GBR|Wales|20818
-GBR_NA|GBR|NA|130659
+GBR_1_1|GBR|England|130659
 USA_AL|USA|Alabama|133995
 USA_AK|USA|Alaska|1501231
 USA_AZ|USA|Arizona|296082
@@ -3347,7 +3430,15 @@ USA_WA|USA|Washington|174789
 USA_WV|USA|West Virginia|62782
 USA_WI|USA|Wisconsin|169315
 USA_WY|USA|Wyoming|253420
-UMI_NA|UMI|Wake|9
+UMI_Baker|UMI|Baker|2
+UMI_Howland|UMI|Howland|2
+UMI_Jarvisisland|UMI|Jarvis island|5
+UMI_Johnston|UMI|Johnston|5
+UMI_KingmanReef|UMI|Kingman Reef|3
+UMI_Midway|UMI|Midway|12
+UMI_Navassa|UMI|Navassa|5
+UMI_Palmyra|UMI|Palmyra|4
+UMI_Wake|UMI|Wake|9
 URY_AR|URY|Artigas|12058
 URY_CA|URY|Canelones|4536
 URY_CL|URY|Cerro Largo|13843
@@ -3388,22 +3479,28 @@ VUT_SE|VUT|Shefa|1522
 VUT_TF|VUT|Tafea|1666
 VUT_TR|VUT|Torba|889
 VEN_Z|VEN|Amazonas|184052
-VEN_NA|VEN|Vargas|1002
+VEN_Anzoátegui|VEN|Anzoátegui|48025
 VEN_C|VEN|Apure|74003
 VEN_D|VEN|Aragua|6977
 VEN_E|VEN|Barinas|36436
+VEN_Bolívar|VEN|Bolívar|241518
 VEN_G|VEN|Carabobo|4812
 VEN_H|VEN|Cojedes|14572
 VEN_Y|VEN|Delta Amacuro|40278
 VEN_DP|VEN|Dependencias Federales|343
 VEN_A|VEN|Distrito Capital|329
+VEN_Falcón|VEN|Falcón|27275
+VEN_Guárico|VEN|Guárico|67685
 VEN_K|VEN|Lara|19166
+VEN_Mérida|VEN|Mérida|12914
 VEN_M|VEN|Miranda|8623
 VEN_N|VEN|Monagas|29251
 VEN_O|VEN|Nueva Esparta|1039
 VEN_P|VEN|Portuguesa|19622
 VEN_R|VEN|Sucre|10950
+VEN_Táchira|VEN|Táchira|10851
 VEN_T|VEN|Trujillo|8129
+VEN_Vargas|VEN|Vargas|1002
 VEN_U|VEN|Yaracuy|6259
 VEN_V|VEN|Zulia|44191
 VNM_AG|VNM|An Giang|3547
@@ -3532,4 +3629,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/java/net/helcel/beans/activity/StatActivity.kt

@@ -1,57 +1,52 @@
 package net.helcel.beans.activity
 
-import android.graphics.Color
 import android.os.Bundle
-import android.util.Log
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
-import com.github.mikephil.charting.charts.PieChart
+import androidx.fragment.app.Fragment
-import com.github.mikephil.charting.data.PieData
+import androidx.recyclerview.widget.LinearLayoutManager
-import com.github.mikephil.charting.data.PieDataSet
+import androidx.recyclerview.widget.RecyclerView
-import com.github.mikephil.charting.data.PieEntry
+import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.github.mikephil.charting.formatter.PercentFormatter
+import androidx.viewpager2.widget.ViewPager2
-import com.github.mikephil.charting.utils.MPPointF
+import com.google.android.material.tabs.TabLayoutMediator
 import net.helcel.beans.R
-import net.helcel.beans.countries.World
+import net.helcel.beans.activity.adapter.StatsListAdapter
-import net.helcel.beans.helper.Data.groups
+import net.helcel.beans.databinding.ActivityStatBinding
-import net.helcel.beans.helper.Data.visits
-import net.helcel.beans.helper.Theme.colorWrapper
 import net.helcel.beans.helper.Theme.createActionBar
 
+private val MODE_LIST = listOf("World", "Country", "Region")
 
 class StatActivity : AppCompatActivity() {
 
-    private lateinit var chart: PieChart
+    private lateinit var _binding: ActivityStatBinding
+    private var activeMode: String = "World"
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        _binding = ActivityStatBinding.inflate(layoutInflater)
-        setContentView(R.layout.activity_stat)
+        setContentView(_binding.root)
         createActionBar(this, getString(R.string.action_stat))
         
+        _binding.stats.layoutManager =
+            LinearLayoutManager(this, RecyclerView.VERTICAL, false)
+        val adapter = StatsListAdapter(_binding.stats)
+        _binding.stats.adapter = adapter
 
-        chart = findViewById(R.id.chart)
+        _binding.pager.adapter = object : FragmentStateAdapter(supportFragmentManager, lifecycle) {
-        chart.setUsePercentValues(true)
+            override fun getItemCount(): Int = 3
-        chart.description.isEnabled = false
+            override fun createFragment(position: Int): Fragment = Fragment()
-        chart.setExtraOffsets(5F, 10F, 5F, 5F)
+        }
+        TabLayoutMediator(_binding.tab, _binding.pager) { tab, position ->
+            tab.text = MODE_LIST[position]
+        }.attach()
 
-        chart.centerText = "Country Area"
+        _binding.pager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
-
+            override fun onPageSelected(position: Int) {
-        chart.setDrawCenterText(true)
+                activeMode = MODE_LIST[position]
-        chart.isDrawHoleEnabled = true
+                adapter.refreshMode(activeMode)
-        chart.setTransparentCircleColor(Color.TRANSPARENT)
+            }
-        chart.setHoleColor(Color.TRANSPARENT)
+        })
-        chart.setCenterTextColor(colorWrapper(this, android.R.attr.colorForeground).color)
+        adapter.refreshMode(activeMode)
-        chart.setTransparentCircleAlpha(0)
-        chart.holeRadius = 40F
-        chart.transparentCircleRadius = 40F
-        chart.rotationAngle = 0F
-        chart.isRotationEnabled = false
-        chart.isHighlightPerTapEnabled = false
-
-        chart.legend.isEnabled = false
-
-        bind()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -59,46 +54,4 @@ class StatActivity : AppCompatActivity() {
         return super.onOptionsItemSelected(item)
     }
 
-
-    private fun bind() {
-        val entries = ArrayList<PieEntry>()
-        val VIS_continents = World.WWW.children.groupBy { visits.getVisited(it) }
-            .map { Pair(it.key, it.value.map { c -> c.area }.fold(0) { acc, i -> acc + i }) }
-        val VIS_country =
-            World.WWW.children.map { it.children }.flatten().groupBy { visits.getVisited(it) }
-                .map { Pair(it.key, it.value.map { c -> c.area }.fold(0) { acc, i -> acc + i }) }
-        val vis = VIS_country
-        Log.d("VIS", vis.toString())
-        val max = vis.map { it.second }.fold(0) { acc, i -> acc + i }
-        vis.forEach {
-            entries.add(
-                PieEntry(
-                    it.second.toFloat().div(max.toFloat()),
-                    groups.getGroupFromKey(it.first).name
-                )
-            )
-        }
-        val dataSet = PieDataSet(entries, "GG1")
-
-        dataSet.valueTextColor = Color.BLACK
-        dataSet.sliceSpace = 3f
-        dataSet.iconsOffset = MPPointF(0f, 40f)
-        dataSet.selectionShift = 5f
-
-
-        dataSet.setDrawIcons(true)
-        dataSet.colors = vis.map { groups.getGroupFromKey(it.first).color.color }.toList()
-
-        val data = PieData(dataSet)
-        data.setDrawValues(false)
-        data.setValueFormatter(PercentFormatter())
-        data.setValueTextSize(11f)
-        data.setValueTextColor(Color.BLACK)
-        chart.setEntryLabelColor(Color.BLACK)
-        chart.data = data
-        chart.highlightValues(null)
-        chart.invalidate()
-    }
-
-
 }

app/src/main/java/net/helcel/beans/activity/adapter/GeolocListAdapter.kt

@@ -13,29 +13,31 @@ 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.Data
+import net.helcel.beans.helper.*
-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>() {
 
+    private val sortedList = l.children.toList().sortedBy { it.fullName }
+
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): FoldingListViewHolder {
         val binding = ItemListGeolocBinding.inflate(
             LayoutInflater.from(viewGroup.context),
             viewGroup,
             false
         )
-        return FoldingListViewHolder(ctx.requireActivity(), binding)
+        return FoldingListViewHolder(ctx.requireActivity(), binding, parentHolder, l)
     }
 
     override fun onBindViewHolder(holder: FoldingListViewHolder, position: Int) {
-        val el = l.children[position]
+        val el = sortedList[position]
         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 +48,13 @@ class GeolocListAdapter(
 
     class FoldingListViewHolder(
         private val ctx: FragmentActivity,
-        private val _binding: ItemListGeolocBinding
+        private val _binding: ItemListGeolocBinding,
-    ) : RecyclerView.ViewHolder(_binding.root) {
+        private val _parentHolder: FoldingListViewHolder? = null,
+        private val _parentGeoLoc: GeoLoc,
+    ) : RecyclerView.ViewHolder(_binding.root), DialogCloser {
 
         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.backgroundTintList = ColorStateList.valueOf(
                 colorWrapper(
@@ -91,11 +85,11 @@ class GeolocListAdapter(
                     if (_binding.checkBox.isChecked) {
                         // If one has just checked the box (assign unique group)
                         Data.selected_group = Data.groups.getUniqueEntry()
-                        onColorDialogDismiss(false)
+                        onDialogDismiss(false)
                     } else {
                         // If one has just unchecked the box (unassign unique group)
                         Data.selected_group = null
-                        onColorDialogDismiss(true)
+                        onDialogDismiss(true)
                     }
                 } else {
                     Data.selected_group = null
@@ -104,39 +98,79 @@ class GeolocListAdapter(
                         "AddColorDialogFragment"
                     )
                 }
+                _parentHolder?.refresh(_parentGeoLoc)
             }
         }
 
-        fun onColorDialogDismiss(clear: Boolean) {
+        override fun onDialogDismiss(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) }
             Data.selected_geoloc = null
             Data.selected_group = null
+            _parentHolder?.refresh(_parentGeoLoc)
         }
 
         private fun refreshCheck(geoLoc: GeoLoc) {
+            _binding.checkBox.checkedState =
+                if (Data.visits.getVisited(geoLoc) == AUTO_GROUP && !Settings.isRegional(ctx) && geoLoc.type == GeoLoc.LocType.COUNTRY) {
+                    MaterialCheckBox.STATE_CHECKED
+                } else 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) {
+            if (Data.visits.getVisited(geoLoc) == AUTO_GROUP) {
-                col = colorWrapper(
+                col = colorWrapper(ctx, android.R.attr.colorPrimary)
-                    ctx,
+            } else if (col.color == Color.TRANSPARENT) {
-                    android.R.attr.panelColorBackground
+                col = colorWrapper(ctx, android.R.attr.panelColorBackground)
-                )
                 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/adapter/GroupListAdapter.kt

@@ -13,7 +13,8 @@ import net.helcel.beans.helper.Theme.getContrastColor
 
 class GroupListAdapter(
     private val activity: FragmentActivity,
-    private val selectDialog: DialogFragment
+    private val selectDialog: DialogFragment,
+    private val delete: Boolean = false
 ) : RecyclerView.Adapter<GroupListAdapter.GroupViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GroupViewHolder {
@@ -63,6 +64,7 @@ class GroupListAdapter(
                 Data.selected_group = entry.second
                 selectDialog.dismiss()
             }
+            if (!delete) {
                 _binding.groupColor.setOnLongClickListener {
                     dialogFragment.show(
                         activity.supportFragmentManager,
@@ -73,3 +75,4 @@ class GroupListAdapter(
             }
         }
     }
+}

app/src/main/java/net/helcel/beans/activity/adapter/StatsListAdapter.kt

@@ -0,0 +1,101 @@
+package net.helcel.beans.activity.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import net.helcel.beans.countries.GeoLoc
+import net.helcel.beans.countries.World
+import net.helcel.beans.databinding.ItemListGroupBinding
+import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.Groups
+import net.helcel.beans.helper.Theme.getContrastColor
+
+class StatsListAdapter(private val stats: RecyclerView) :
+    RecyclerView.Adapter<StatsListAdapter.StatsViewHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): StatsViewHolder {
+        val binding =
+            ItemListGroupBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+
+
+        return StatsViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: StatsViewHolder, pos: Int) {
+        holder.bind(Data.groups.getGroupFromPos(pos))
+    }
+
+    override fun getItemCount(): Int {
+        return Data.groups.size()
+    }
+
+    fun refreshMode(mode: String) {
+        for (i in 0 until itemCount) {
+            val viewHolder = stats.findViewHolderForAdapterPosition(i) as? StatsViewHolder
+            viewHolder?.refresh(mode)
+        }
+
+    }
+
+    inner class StatsViewHolder(
+        private val _binding: ItemListGroupBinding
+    ) : RecyclerView.ViewHolder(_binding.root) {
+
+        private lateinit var data: Pair<Int, Groups.Group>
+        private var countMode: Boolean = true
+        private var locMode: String = "World"
+
+        private lateinit var wwwCount: List<GeoLoc>
+        private lateinit var countryCount: List<GeoLoc>
+        private lateinit var stateCount: List<GeoLoc>
+        fun bind(entry: Pair<Int, Groups.Group>) {
+            data = entry
+            _binding.groupColor.text = entry.second.name
+
+            val entryColor = data.second.color.color
+            val contrastEntryColor = getContrastColor(entryColor)
+            _binding.groupColor.setBackgroundColor(entryColor)
+            _binding.groupColor.setTextColor(contrastEntryColor)
+            _binding.name.setTextColor(contrastEntryColor)
+
+            _binding.groupColor.setOnClickListener {
+                countMode = !countMode
+                refresh(locMode)
+            }
+            compute()
+            refresh(locMode)
+        }
+
+        private fun compute() {
+            val visited = Data.visits.getVisitedByValue(data.first)
+            wwwCount = World.WWW.children.filter { it.code in visited }
+            countryCount =
+                World.WWW.children.map { it.children.filter { itt -> itt.code in visited } }
+                    .flatten()
+            stateCount =
+                World.WWW.children.map { it.children.map { itt -> itt.children.filter { ittt -> ittt.code in visited } } }
+                    .flatten().flatten()
+        }
+
+        fun refresh(mode: String) {
+            locMode = mode
+            if (countMode) {
+                _binding.name.text = when (locMode) {
+                    "World" -> wwwCount.size
+                    "Country" -> countryCount.size
+                    "Region" -> stateCount.size
+                    else -> "?"
+                }.toString()
+            } else {
+                _binding.name.text = when (locMode) {
+                    "World" -> wwwCount.sumOf { it.area }
+                    "Country" -> countryCount.sumOf { it.area }
+                    "Region" -> stateCount.sumOf { it.area }
+                    else -> "?"
+                }.toString()
+            }
+
+        }
+
+    }
+}

app/src/main/java/net/helcel/beans/activity/adapter/ViewPagerAdapter.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import net.helcel.beans.activity.fragment.EditPlaceFragment
+import kotlin.math.max
 
 class ViewPagerAdapter(
     fragmentManager: FragmentManager,
@@ -17,15 +18,13 @@ class ViewPagerAdapter(
     private val fragmentList: MutableList<EditPlaceFragment> = ArrayList()
 
     fun addFragment(src: EditPlaceFragment?, target: EditPlaceFragment) {
-        if (src != null) {
+        val idx = fragmentList.indexOf(src)
-            while (fragmentList.last() != src) {
+        viewPager.currentItem = max(0, idx)
-                fragmentList.removeLast()
+        if (src != null && idx >= 0) {
-                notifyItemRemoved(fragmentList.size)
+            fragmentList.subList(idx + 1, fragmentList.size).clear()
         }
-        }
-        println(src.toString() + " -  " + target.toString())
         fragmentList.add(target)
-        notifyItemInserted(fragmentList.size)
+        notifyItemRangeChanged(max(0, idx), fragmentList.size)
         viewPager.currentItem = fragmentList.size - 1
     }
 

app/src/main/java/net/helcel/beans/activity/fragment/EditGroupAddFragment.kt

@@ -52,8 +52,8 @@ class EditGroupAddFragment(
                 .setPositiveButton(android.R.string.ok) { _, _ ->
                     val pos = Data.groups.findGroupPos(key)
                     // Remove all countries belonging to that group
-                    // Delete the group
                     Data.visits.deleteVisited(key)
+                    // Delete the group
                     Data.groups.deleteGroup(key)
                     Data.saveData()
                     onDelCb(pos)

app/src/main/java/net/helcel/beans/activity/fragment/EditPlaceColorFragment.kt

@@ -3,17 +3,19 @@ package net.helcel.beans.activity.fragment
 import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
+import android.view.View
 import androidx.fragment.app.DialogFragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import net.helcel.beans.activity.adapter.GeolocListAdapter
+import net.helcel.beans.R
 import net.helcel.beans.activity.adapter.GroupListAdapter
 import net.helcel.beans.databinding.FragmentEditPlacesColorsBinding
 import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.DialogCloser
 
 
-class EditPlaceColorFragment(private val parent: GeolocListAdapter.FoldingListViewHolder) :
+class EditPlaceColorFragment(private val parent: DialogCloser, private val delete: Boolean = false) :
     DialogFragment() {
 
     private lateinit var _binding: FragmentEditPlacesColorsBinding
@@ -21,7 +23,8 @@ class EditPlaceColorFragment(private val parent: GeolocListAdapter.FoldingListVi
     private var clear: Boolean = false
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = MaterialAlertDialogBuilder(requireContext())
+        val ctx = requireContext()
+        val builder = MaterialAlertDialogBuilder(ctx)
         _binding = FragmentEditPlacesColorsBinding.inflate(layoutInflater)
         _binding.btnAdd.setOnClickListener {
             EditGroupAddFragment(0, {
@@ -34,16 +37,25 @@ class EditPlaceColorFragment(private val parent: GeolocListAdapter.FoldingListVi
         }
 
         val dialog = builder.setView(_binding.root).create()
-        listAdapt = GroupListAdapter(requireActivity(), this)
+        listAdapt = GroupListAdapter(requireActivity(), this, delete)
         _binding.groupsColor.layoutManager =
-            LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
+            LinearLayoutManager(ctx, RecyclerView.VERTICAL, false)
         _binding.groupsColor.adapter = listAdapt
 
+        if (delete) {
+            _binding.btnAdd.visibility = View.GONE
+            _binding.btnClear.text = ctx.getString(R.string.cancel)
+            with (_binding.warningText) {
+                visibility = View.VISIBLE
+                text = ctx.getString(R.string.select_group)
+            }
+        }
+
         return dialog
     }
 
     override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
-        parent.onColorDialogDismiss(clear)
+        parent.onDialogDismiss(clear)
     }
 }

app/src/main/java/net/helcel/beans/activity/fragment/EditPlaceFragment.kt

@@ -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

@@ -5,29 +5,54 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceManager
 import net.helcel.beans.R
 import net.helcel.beans.countries.GeoLocImporter
+import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.DialogCloser
 
 
-class SettingsFragment : PreferenceFragmentCompat() {
+class SettingsFragment : PreferenceFragmentCompat(), DialogCloser {
+    private var savedInstanceState: Bundle? = null
+    private var rootKey: String? = null
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        this.savedInstanceState = savedInstanceState
+        this.rootKey = rootKey
+
         setPreferencesFromResource(R.xml.fragment_settings, rootKey)
         val ctx = requireContext()
-        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()
-            }
-            true
-        }
 
         // Select Light/Dark/System Mode
         findPreference<Preference>(getString(R.string.key_theme))?.setOnPreferenceChangeListener { _, key ->
             setTheme(ctx, key as String)
         }
 
+        // Toggle groups
+        findPreference<Preference>(getString(R.string.key_group))?.setOnPreferenceChangeListener { _, key ->
+            if (key as String == ctx.getString(R.string.off)) {
+                val fragment = EditPlaceColorFragment(this, true)
+                fragment.show(
+                    this.parentFragmentManager,
+                    "AddColorDialogFragment"
+                )
+                false
+            } else {
+                true
+            }
+        }
+
+
+        // Toggle regional geolocs
+        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, true)
+            }
+            true
+        }
+
+
         // Open license fragment
         findPreference<Preference>(getString(R.string.licenses))?.setOnPreferenceClickListener {
             requireActivity().supportFragmentManager.beginTransaction()
@@ -59,4 +84,30 @@ class SettingsFragment : PreferenceFragmentCompat() {
             return true
         }
     }
+
+    override fun onDialogDismiss(clear: Boolean) {
+        // When turning groups off, select one group to keep and reassign everything
+        Data.selected_group?.let { selectedGroup ->
+            // Reassign all visited that are not to selectedGroup to selectedGroup
+            Data.visits.reassignAllVisitedtoGroup(selectedGroup.key)
+
+            // Delete all groups that are not selectedGroup
+            Data.groups.deleteAllExcept(selectedGroup.key)
+
+            // Save and clear global variables
+            Data.saveData()
+            Data.selected_geoloc = null
+            Data.selected_group = null
+
+            // Actually change preference
+            val ctx = requireContext()
+            val sp = PreferenceManager.getDefaultSharedPreferences(ctx)
+            sp.edit().putString(ctx.getString(R.string.key_group), ctx.getString(R.string.off))
+                .apply()
+
+            // Refresh entire preference fragment to reflect changes
+            preferenceScreen.removeAll()
+            onCreatePreferences(savedInstanceState, rootKey)
+        }
+    }
 }

app/src/main/java/net/helcel/beans/countries/Country.kt

@@ -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),
@@ -265,5 +263,5 @@ enum class Country(
 
     override val code = this.name
     override val type = GeoLoc.LocType.COUNTRY
-    override val children: MutableList<GeoLoc> = ArrayList()
+    override val children: MutableSet<GeoLoc> = HashSet()
 }

app/src/main/java/net/helcel/beans/countries/GeoLoc.kt

@@ -15,7 +15,7 @@ interface GeoLoc {
     val area: Int
 
     val type: LocType
-    val children: List<GeoLoc>
+    val children: Set<GeoLoc>
 
     fun shouldShowChildren(ctx: Context): Boolean {
         if (children.isEmpty())

app/src/main/java/net/helcel/beans/countries/GeoLocImporter.kt

@@ -1,14 +1,17 @@
 package net.helcel.beans.countries
 
 import android.content.Context
+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 java.io.BufferedReader
 import java.io.InputStreamReader
 
 object GeoLocImporter {
 
-    fun importStates(ctx: Context) {
+    fun importStates(ctx: Context, force: Boolean = false) {
-        if (!Settings.isRegional(ctx)) {
+        if (!Settings.isRegional(ctx) and !force) {
             return
         }
         val fs = BufferedReader(InputStreamReader(ctx.assets.open("geoloc_state.txt")))
@@ -20,6 +23,19 @@ object GeoLocImporter {
     }
 
     fun clearStates() {
-        Country.entries.forEach { it.children.clear() }
+        Country.entries.forEach { country ->
+            if (country.children.any { region ->
+                Data.visits.getVisited(region) != NO_GROUP
+            }) {
+                if (Data.visits.getVisited(country) == NO_GROUP) {
+                    Data.visits.setVisited(country, AUTO_GROUP)
+                }
+                country.children.forEach { region ->
+                    Data.visits.setVisited(region, NO_GROUP)
+                }
+                Data.saveData()
+            }
+            country.children.clear()
+        }
     }
 }

app/src/main/java/net/helcel/beans/countries/Group.kt

@@ -2,10 +2,12 @@ package net.helcel.beans.countries
 
 import net.helcel.beans.countries.Country.*
 
-enum class Group(override val fullName: String, override val children: List<GeoLoc>) : GeoLoc {
+enum class Group(override val fullName: String, override val children: Set<GeoLoc>) : GeoLoc {
 
     EEE(
-        "Europe", listOf(
+        "Europe", setOf(
+            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,25 +55,28 @@ 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(
-        "Asia", listOf(
+        "Asia", setOf(
             AFG,
             ARM,
             AZE,
             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,
@@ -111,7 +121,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
         )
     ),
     FFF(
-        "Africa", listOf(
+        "Africa", setOf(
             DZA,
             AGO,
             BDI,
@@ -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,
@@ -176,7 +187,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
         )
     ),
     NNN(
-        "North America", listOf(
+        "North America", setOf(
             ABW,
             AIA,
             ATG,
@@ -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,19 +221,22 @@ 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(
-        "South America", listOf(
+        "South America", setOf(
             ARG,
             BOL,
             BRA,
@@ -238,7 +254,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
         )
     ),
     UUU(
-        "Oceania", listOf(
+        "Oceania", setOf(
             ASM,
             AUS,
             COK,
@@ -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,
@@ -267,39 +284,22 @@ enum class Group(override val fullName: String, override val children: List<GeoL
     ),
 
     XXX(
-        "Others", listOf(
+        "Others", setOf(
             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
         )
     ),
 
     ZZZ(
-        "Undefined", listOf(
+        "Undefined", setOf(
         )
     ),
 
 
     NTT(
-        "NATO", listOf(
+        "NATO", setOf(
             ALB, BEL, BGR, CAN, HRV, CZE, DNK, EST, FRA, DEU, GRC, HUN, ISL, ITA, LVA, LTU, LUX,
             MNE, NLD, NOR, POL, PRT, ROU, SVK, SVN, ESP, TUR, GBR, USA
         )

app/src/main/java/net/helcel/beans/countries/State.kt

@@ -3,6 +3,17 @@ package net.helcel.beans.countries
 class State(override val code: String, override val fullName: String, override val area: Int) :
     GeoLoc {
 
-    override val children = emptyList<GeoLoc>()
+    override val children = emptySet<GeoLoc>()
     override val type = GeoLoc.LocType.STATE
+
+    override fun hashCode(): Int {
+        return code.hashCode()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other is GeoLoc) {
+            return other.code == this.code
+        }
+        return false
+    }
 }

app/src/main/java/net/helcel/beans/countries/World.kt

@@ -2,11 +2,13 @@ package net.helcel.beans.countries
 
 import net.helcel.beans.countries.Group.*
 
-enum class World(override val fullName: String, override val children: List<GeoLoc>) : GeoLoc {
+enum class World(override val fullName: String, override val children: Set<GeoLoc>) : GeoLoc {
 
-    WWW("World", listOf(
+    WWW(
+        "World", setOf(
             EEE, ABB, FFF, NNN, SRR, UUU, XXX
-    ));
+        )
+    );
 
     override val area = children.fold(0) { acc, i ->
         acc + i.area

app/src/main/java/net/helcel/beans/helper/Data.kt

@@ -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/DialogCloser.kt

@@ -0,0 +1,5 @@
+package net.helcel.beans.helper
+
+interface DialogCloser {
+    fun onDialogDismiss(clear: Boolean)
+}

app/src/main/java/net/helcel/beans/helper/Groups.kt

@@ -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>) {
 
@@ -24,13 +28,18 @@ class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
         grps.remove(key)
     }
 
+    fun deleteAllExcept(grp: Int) {
+        val keysToDelete = grps.keys.filter { it != grp }
+        keysToDelete.forEach { grps.remove(it) }
+    }
+
     fun getGroupFromKey(key: Int): Group {
         return grps.getOrDefault(key, EmptyGroup())
     }
 
     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
     }
 
@@ -56,6 +65,10 @@ class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
         return grps.keys.toList().indexOf(key)
     }
 
+    fun forEach(action: (Map.Entry<Int, Group>) -> Unit) {
+        grps.forEach { action(it) }
+    }
+
     class EmptyGroup : Group(0, "")
 
     @Serializable

app/src/main/java/net/helcel/beans/helper/Visits.kt

@@ -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 {
@@ -42,6 +42,19 @@ class Visits(val id: Int, private val locs: HashMap<String, Int>) {
         return locs.keys.groupBy { getVisited(it) }
     }
 
+    fun getVisitedByValue(key: Int): List<String> {
+        return locs.filter { it.value == key }.keys.toList()
+    }
+
+    fun reassignAllVisitedtoGroup(group: Int) {
+        val keys = locs.filter { (_, grp) ->
+            grp !in listOf(NO_GROUP, AUTO_GROUP)
+        }.keys
+        keys.forEach {
+            locs[it] = group
+        }
+    }
+
     @OptIn(ExperimentalSerializationApi::class)
     @Serializer(Visits::class)
     class VisitsSerializer {

app/src/main/java/net/helcel/beans/svg/CSSWrapper.kt

@@ -2,49 +2,65 @@ package net.helcel.beans.svg
 
 import android.content.Context
 import net.helcel.beans.countries.World
+import net.helcel.beans.helper.AUTO_GROUP
+import net.helcel.beans.helper.Data
 import net.helcel.beans.helper.Data.groups
 import net.helcel.beans.helper.Data.visits
+import net.helcel.beans.helper.NO_GROUP
+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)
+            if (!Settings.isRegional(ctx) && k == AUTO_GROUP) {
+                v.joinToString(",") { "#${it}$id,#${it}" } + "{fill:${
+                    colorToHex6(colorWrapper(ctx, android.R.attr.colorPrimary))
+                };}"
+            }
+            else if (groups.getGroupFromKey(k).key == NO_GROUP)
                 ""
             else
-                v.joinToString(",") { "#${it}1,#${it}" } + "{fill:${
+                v.joinToString(",") { "#${it}$id,#${it}" } + "{fill:${
-                    colorToHex6(
+                    colorToHex6(groups.getGroupFromKey(k).color)
-                        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

@@ -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

@@ -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/layout/activity_stat.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -7,9 +8,59 @@
     android:theme="@style/Theme.Beans"
     tools:context=".activity.StatActivity">
 
-    <com.github.mikephil.charting.charts.PieChart
+    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/chart"
+        android:id="@+id/tab"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="wrap_content" />
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:visibility="gone" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="10dp">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/group_color"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
+            android:paddingStart="56dp"
+            android:text="@string/total"
+            android:textAlignment="textStart"
+            android:textColor="?attr/colorOnPrimary"
+            app:cornerRadius="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlSymmetry" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:gravity="start|center_vertical"
+            android:paddingStart="20dp"
+            android:paddingEnd="52dp"
+            android:text="TODO"
+            android:textColor="?attr/colorOnPrimary"
+            app:layout_constraintBottom_toBottomOf="@id/group_color"
+            app:layout_constraintEnd_toEndOf="@id/group_color"
+            app:layout_constraintTop_toTopOf="@id/group_color" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/stats"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 
 </LinearLayout>

app/src/main/res/layout/fragment_edit_places_colors.xml

@@ -6,6 +6,13 @@
     android:orientation="vertical"
     android:padding="16dp">
 
+    <TextView
+        android:id="@+id/warning_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:visibility="gone" />
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/res/values/en.xml

@@ -21,6 +21,7 @@
     <string name="foss_licenses">Free and open source dependencies and licenses</string>
     <string name="about_beans">About the Beans application</string>
     <string name="delete_group">Are your sure you want to delete this group and remove all its country mappings?</string>
+    <string name="select_group">Select one group you want to keep. All others will be deleted and its mappings reassigned to the group you choose here.</string>
     <string name="add">Add</string>
     <string name="clear">Clear</string>
     <string name="logo">Logo</string>
@@ -34,4 +35,5 @@
     <string name="delete">Delete</string>
     <string name="cancel">Cancel</string>
     <string name="ok">Ok</string>
+    <string name="total">Total</string>
 </resources>

app/src/main/res/xml/fragment_settings.xml

@@ -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:entries="@array/entries_theme"
-        app:entryValues="@array/entries_onoff"
+        app:entryValues="@array/entries_theme"
-        app:icon="@drawable/edit"
+        app:icon="@drawable/palette"
-        app:key="@string/key_group"
+        app:key="@string/key_theme"
-        app:title="@string/key_group"
+        app:title="@string/key_theme"
-        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: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:allowDividerAbove="true"
-        app:entryValues="@array/entries_theme"
+        app:entries="@array/entries_onoff"
-        app:icon="@drawable/palette"
+        app:entryValues="@array/entries_onoff"
-        app:key="@string/key_theme"
+        app:icon="@drawable/group"
-        app:title="@string/key_theme"
+        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" />

genenum.js

@@ -58,12 +58,25 @@ const groups = {
 var dict0 = {}
 var dict1 = {}
 
-const formatStr = (str)=> str.replace(/(?<!\b\w)\B[A-Z]|,(?!$)/g, match => {
+const formatStr = (str)=> str.replace(/(?<!\b\w\u00E0-\u00FC)\B[A-Z\u00C0-\u00DC]|,(?!$)/g, match => {
   if (match.startsWith(',')) {
       return ', ';
   } else {
       return ' ' + match;
-  }})
+  }}).replace("ofthe "," of the ").replace("dela ", " de la ").replace("delos ", " de los ").replace("áD","á D")
+  .replace("Côted'","Côte d'").replace("leof ","le of ").replace("dde ","d de ").replace("iode ","io de ").replace("àde ","à de ")
+  .replace("yof ","y of ").replace("Andrésy ","Andrés y")
+  .replace("aand ","a and ").replace("iand ", "i and ").replace("tsand ","ts and ").replace("onand ","on and ").replace("reand ", "re and ")
+  .replace("odel ","o del ").replace("adel ", "a del ").replace("ndel ","n del ").replace("zdel ","z del ").replace("falde ", "fal de ").replace("casdel ","cas del ")
+  .replace("odosÓ", "o dos Ó")
+  .replace("Grandedo ", "Grande do ").replace("Grandede ","Grande de ")
+  .replace("Santiagode ","Santiago de ").replace("Joséde ","José de ").replace("Pedrode ","Pedro de ")
+  .replace("andthe "," and the ")
+  .replace("emunicipality", "e municipality").replace("Villede ", "Ville de ")
+  .replace("Valledel ","Valle del ").replace("Valde ","Val de ").replace("Îlesdu ","Îles du ")
+  .replace("sÉ","s É").replace("áO","á O").replace("N C Tof ","NCT of ").replace("N A","NA")
+  .replace("Nortede ", "Norte de ")
+  .trim()
 
 const parse0 = (country) => {
   const filepath = `temp/0/${country}.json`

gensvg.sh

@@ -6,6 +6,7 @@ GADM_VERSION="4.1"
 GADM_BASEPATH="https://geodata.ucdavis.edu/gadm"
 
 mapshaper="./node_modules/mapshaper/bin/mapshaper"
+ATA_URL="https://media.githubusercontent.com/media/wmgeolab/geoBoundaries/905b0baf5f4fb3b9ccf45293647dcacdb2b799d4/releaseData/gbOpen/ATA/ADM0/geoBoundaries-ATA-ADM0_simplified.geojson"
 
 countries=(
   "AFG" "XAD" "ALA" "ALB" "DZA" "ASM" "AND" "AGO" "AIA" "ATG" "ARG" "ARM" "ABW" "AUS" "AUT" "AZE"
@@ -67,7 +68,10 @@ download_1() {
         jq '.features[] |= . + {properties: (.properties | .GID_1 = (.GID_0 + "_" + (
             if .HASC_1 != "NA" then (.HASC_1 | split(".") | .[-1])
             elif .ISO_1 != "NA" then (.ISO_1 | split("-") | .[-1])
-            else (.CC_1)
+            elif .CC_1 != "NA" then (.CC_1)
+            elif .NAME_1 != "NA" then (.NAME_1)
+            elif .GID_1 != "NA" then (.GID_1 | split(".") | .[-1])
+            else .GID_1
             end
             )))}' "$output_dir/gadm41_${1}_1.json"  > "$output_dir/$1.json.1"
         sed -E 's/"[gadm41_]*([A-Z]*)_1"/"\1"/g' "$output_dir/$1.json.1" > "$output_dir/$1.json"
@@ -76,7 +80,7 @@ download_1() {
 
 
 toSVG_0() {
-    local input_files=()
+    local input_files=("ATA")
 
     for country in "${countries[@]}"
     do
@@ -94,7 +98,7 @@ toSVG_0() {
 }
 
 toSVG_1() {
-    input_files=()
+    input_files=("ATA")
 
     for country in "${countries[@]}"
     do
@@ -113,12 +117,12 @@ toSVG_1() {
 
 
 toSVG_01() {
-    input_files=()
+    input_files=("./temp/1/ATA.json" "./temp/0/ATA.json")
 
     for country in "${countries[@]}"
     do
-        input_file0="./temp/0/${country}.json"
         input_file1="./temp/1/${country}.json"
+        input_file0="./temp/0/${country}.json"
         if [ -f "$input_file1" ]; then
             input_files+=("$input_file1")
         fi
@@ -127,8 +131,13 @@ toSVG_01() {
         fi
     done
 
-    "$mapshaper" -i combine-files ${input_files[@]} -proj webmercator -simplify 0.005 weighted keep-shapes resolution=1200x1200  -o ./app/src/main/assets/mercator01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+
-    "$mapshaper" -i combine-files ${input_files[@]} -proj aeqd +lat_0=90 -simplify 0.005 weighted keep-shapes resolution=1200x1200 -o ./app/src/main/assets/aeqd01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    # "$mapshaper" -i combine-files ${input_files[@]} -proj eqdc +lat_1=55 +lat_2=60 -simplify 0.005 weighted keep-shapes resolution=1200x1200  -o ./app/src/main/assets/eqdc01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    # "$mapshaper" -i combine-files ${input_files[@]} -proj loxim -simplify 0.005 weighted keep-shapes resolution=1200x1200  -o ./app/src/main/assets/loxim01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    # "$mapshaper" -i combine-files ${input_files[@]} -proj eqearth -simplify 0.005 weighted keep-shapes resolution=1200x1200  -o ./app/src/main/assets/eqearth01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    "$mapshaper" -i combine-files ${input_files[@]} -proj merc +lat_ts=47.36667 -simplify 0.005 weighted keep-shapes resolution=1200x1200  -o ./app/src/main/assets/mercator01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    # "$mapshaper" -i combine-files ${input_files[@]} -proj webmercator -simplify 0.005 weighted keep-shapes resolution=1200x1200  -o ./app/src/main/assets/webmercator01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    # "$mapshaper" -i combine-files ${input_files[@]} -proj aeqd +lat_0=90 -simplify 0.005 weighted keep-shapes resolution=1200x1200 -o ./app/src/main/assets/aeqd01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
 }
 
 do_1() {
@@ -136,15 +145,17 @@ do_1() {
     do
         download_1 "$country"
     done
+    wget -q -O "./temp/1/ATA.json" "$ATA_URL"
 }
 do_0() {
     for country in "${countries[@]}"
     do
         download_0 "$country"
     done
+    wget -q -O "./temp/1/ATA.json" "$ATA_URL"
 }
-# do_0
+do_0
 do_1
 # toSVG_0
-toSVG_1
+# toSVG_1
 toSVG_01