Change some country names

.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")
         }
     }

app/src/main/assets/geoloc_state.txt

@@ -1896,7 +1896,7 @@ MAR_FB|MAR|Fès-Boulemane|19366
 MAR_GB|MAR|Gharb-Chrarda-Béni Hssen|8782
 MAR_GC|MAR|Grand Casablanca|879
 MAR_GE|MAR|Guelmim-Es-Semara|64701
-MAR_LB|MAR|Laâyoune-Boujdour-Sakia El H|5763
+MAR_LB|MAR|Laâyoune-Boujdour-Sakia El Hamra|5763
 MAR_MK|MAR|Marrakech-Tensift-Al Haouz|32483
 MAR_MT|MAR|Meknès-Tafilalet|60303
 MAR_OR|MAR|Oriental|59914
@@ -3295,7 +3295,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_NA|GBR|England|130659
 USA_AL|USA|Alabama|133995
 USA_AK|USA|Alaska|1501231
 USA_AZ|USA|Arizona|296082
@@ -3532,4 +3532,3 @@ Z05_UT|IND|Uttarakhand|259
 Z09_UT|IND|Uttarakhand|987
 Z06_JK|PAK|Azad Kashmir|13931
 Z06_NA|PAK|Gilgit-Baltistan|68053
-GBR_EN|GBR|England|417

app/src/main/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),

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

@@ -6,6 +6,8 @@ enum class Group(override val fullName: String, override val children: List<GeoL
 
     EEE(
         "Europe", listOf(
+            XAD,
+            ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
             ALB,
             AND,
             AUT,
@@ -18,14 +20,19 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             CZE,
             DNK,
             EST,
+            FRO, // Faroe Islands: an autonomous region of Denmark
             FIN,
             FRA,
             DEU,
+            GIB, // Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
             GRC,
+            GGY, // Guernsey: a British Crown dependency in the English Channel
             HUN,
             ISL,
             IRL,
+            IMN, // Isle of Man: a British Crown dependency located in the Irish Sea
             ITA,
+            JEY, // Jersey: a British Crown dependency located in the English Channel
             KAZ,
             XKO,
             LVA,
@@ -48,12 +55,12 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             SVK,
             SVN,
             ESP,
+            SJM, // Svalbard and Jan Mayen: an archipelago administered by Norway
             SWE,
             CHE,
             UKR,
             GBR,
             VAT,
-            XAD,
         )
     ),
     ABB(
@@ -64,9 +71,12 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             BHR,
             BGD,
             BTN,
+            IOT, // British Indian Ocean Territory: a British overseas territory in the Indian Ocean
             BRN,
             KHM,
+            CCK, // Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
             CHN,
+            CXR, // Christmas Island: an Australian external territory in the Indian Ocean
             GEO,
             HKG,
             IND,
@@ -131,8 +141,8 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             EGY,
             GNQ,
             ERI,
-            SWZ,
             ETH,
+            ATF, // French Southern and Antarctic Lands: a territory of France located in the southern Indian Ocean
             GAB,
             GMB,
             GHA,
@@ -165,6 +175,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             SSD,
             SHN,
             SDN,
+            SWZ,
             TZA,
             TGO,
             TUN,
@@ -184,9 +195,11 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             BRB,
             BLZ,
             BMU,
+            BES, // Bonaire, Sint Eustatius and Saba: special municipalities of the Netherlands in the Caribbean
             VGB,
             CAN,
             CYM,
+            XCL,
             CRI,
             CUB,
             CUW,
@@ -208,15 +221,18 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             NIC,
             PAN,
             PRI,
+            BLM, // Saint Barthélemy: an overseas collectivity of France in the Caribbean
             KNA,
             LCA,
             MAF,
             SPM,
             VCT,
+            SXM, // Sint Maarten: a constituent country of the Kingdom of the Netherlands in the Caribbean
             TTO,
             TCA,
             USA,
-            XCL,
+            UMI, // United States Minor Outlying Islands: a collection of nine insular areas of the United States
+            VIR, // United States Virgin Islands: an unincorporated territory of the United States in the Caribbean
         )
     ),
     SRR(
@@ -257,6 +273,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             PLW,
             PNG,
             PCN,
+            WSM, // Samoa: an independent island nation in the South Pacific
             SLB,
             TKL,
             TON,
@@ -269,26 +286,9 @@ enum class Group(override val fullName: String, override val children: List<GeoL
     XXX(
         "Others", listOf(
             ATA, // Antarctica: not in any other region
-            ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
-            BES,// Bonaire, Sint Eustatius and Saba: special municipalities of the Netherlands in the Caribbean
             BVT, // Bouvet Island: an uninhabited territory of Norway in the South Atlantic
-            IOT,// British Indian Ocean Territory: a British overseas territory in the Indian Ocean
-            CXR,// Christmas Island: an Australian external territory in the Indian Ocean
-            CCK,// Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
-            FRO,// Faroe Islands: an autonomous region of Denmark
-            ATF,// French Southern and Antarctic Lands: a territory of France located in the southern Indian Ocean
-            GIB,// Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
-            GGY,// Guernsey: a British Crown dependency in the English Channel
             HMD, // Heard Island and McDonald Islands: an uninhabited Australian external territory in the southern Indian Ocean
-            IMN,// Isle of Man: a British Crown dependency located in the Irish Sea
-            JEY,// Jersey: a British Crown dependency located in the English Channel
-            BLM,// Saint Barthélemy: an overseas collectivity of France in the Caribbean
-            WSM, // Samoa: an independent island nation in the South Pacific
-            SXM, // Sint Maarten: a constituent country of the Kingdom of the Netherlands in the Caribbean
             SGS, // South Georgia and the South Sandwich Islands: a British overseas territory in the southern Atlantic Ocean
-            SJM, // Svalbard and Jan Mayen: an archipelago administered by Norway
-            UMI, // United States Minor Outlying Islands: a collection of nine insular areas of the United States
-            VIR, // United States Virgin Islands: an unincorporated territory of the United States in the Caribbean
         )
     ),