Update plugin com.android.application to v8.3.2

.github/workflows/build.yml

@@ -32,7 +32,7 @@ jobs:
           gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch keystore.asc > app/keystore.properties
           gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch key.asc > app/key.jks          
 
-      - uses: gradle/wrapper-validation-action@v3
+      - uses: gradle/wrapper-validation-action@v2
 
       - name: create and checkout branch
         if: github.event_name == 'pull_request'

README.md

@@ -39,11 +39,8 @@
 ## 📳 Installation
 
 <div style="display: flex; justify-content: center; align-items: center; flex-direction: row;">
-    <!--<a href="https://f-droid.org/packages/net.helcel.beans/">
+    <a href="https://f-droid.org/packages/net.helcel.beans/">
         <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" width="206">
-    </a>-->
-    <a href="https://apt.izzysoft.de/fdroid/index/apk/net.helcel.beans">
-        <img width="200" height="80" alt="Izzy Download" src=".github/images/izzy.png">
     </a>
     <a href="https://github.com/helcel-net/beans/releases/latest">
         <img width="200" height="84" alt="APK Download" src=".github/images/apk.png">
@@ -71,7 +68,7 @@ Thanks to all contributors, the developers of our dependencies, and our users.
 ## 📝 License
 
 ```
-Copyright (C) 2024 Helcel & MYDOLI
+Copyright (C) 2024 Helcel MYDOLI
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

app/build.gradle

@@ -1,8 +1,8 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.0'
-    id 'com.mikepenz.aboutlibraries.plugin' version '12.2.4'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.23'
+    id 'com.mikepenz.aboutlibraries.plugin' version '11.1.3'
 }
 
 
@@ -14,8 +14,8 @@ android {
         applicationId 'net.helcel.beans'
         minSdk 28
         targetSdk 34
-        versionCode 2
-        versionName "1.0b"
+        versionCode 1
+        versionName "1.0"
     }
     signingConfigs {
         create("release") {
@@ -77,17 +77,15 @@ android {
 }
 aboutLibraries {
     exclusionPatterns = [~"androidx.*", ~"com.google.android.*", ~"org.jetbrains.*"]
-    configPath = "config"
-    excludeFields = ["generated"]
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4'
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'com.google.android.material:material:1.12.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0'
+    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3'
 
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation 'com.mikepenz:aboutlibraries:12.2.4'
+    implementation 'com.mikepenz:aboutlibraries:11.1.3'
 }

app/src/main/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="2"
-    android:versionName="1.0c">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"

app/src/main/java/net/helcel/beans/activity/EditActivity.kt

@@ -5,14 +5,17 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import com.google.android.material.tabs.TabLayoutMediator
 import net.helcel.beans.R
 import net.helcel.beans.activity.adapter.ViewPagerAdapter
 import net.helcel.beans.activity.fragment.EditGroupAddFragment
+import net.helcel.beans.activity.fragment.EditPlaceColorFragment
 import net.helcel.beans.activity.fragment.EditPlaceFragment
 import net.helcel.beans.countries.World
 import net.helcel.beans.databinding.ActivityEditBinding
 import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.DialogCloser
 import net.helcel.beans.helper.Settings
 import net.helcel.beans.helper.Theme.createActionBar
 
@@ -59,7 +62,6 @@ class EditActivity : AppCompatActivity() {
                     }, {}, false).show(supportFragmentManager, "AddColorDialogFragment")
                 }
             }
-
             else -> finish()
         }
         return super.onOptionsItemSelected(item)

app/src/main/java/net/helcel/beans/activity/MainActivity.kt

@@ -12,6 +12,7 @@ import net.helcel.beans.countries.GeoLocImporter
 import net.helcel.beans.databinding.ActivityMainBinding
 import net.helcel.beans.helper.Data
 import net.helcel.beans.helper.Settings
+import net.helcel.beans.helper.Theme.colorWrapper
 import net.helcel.beans.svg.CSSWrapper
 import net.helcel.beans.svg.SVGWrapper
 

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

@@ -287,8 +287,8 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
     ),
 
     XXX(
-        "Other", setOf(
-           
+        "Antarctica", setOf(
+            ATA, // Antarctica: not in any other region
         )
     ),
 

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

@@ -6,15 +6,14 @@ enum class World(override val fullName: String, override val children: Set<GeoLo
 
     WWW(
         "World", setOf(
-            EEE, ABB, FFF, NNN, SRR, UUU, Country.ATA,
-
-            )
+            EEE, ABB, FFF, NNN, SRR, UUU, XXX
+        )
     );
 
     override val area = children.fold(0) { acc, i ->
         acc + i.area
     }
-
+    
     override val type = GeoLoc.LocType.WORLD
     override val code = this.name
 }

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

@@ -1,15 +1,13 @@
 package net.helcel.beans.svg
 
 import android.content.Context
-import android.content.SharedPreferences
 import androidx.preference.PreferenceManager
 import com.caverock.androidsvg.SVG
 import net.helcel.beans.R
 
 class SVGWrapper(ctx: Context) {
 
-    private val sharedPreferences: SharedPreferences =
-        PreferenceManager.getDefaultSharedPreferences(ctx)
+    val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(ctx)
     private val svgFile = when (sharedPreferences.getString(
         ctx.getString(R.string.key_projection),
         ctx.getString(R.string.mercator)

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Beans</string>
-    <string name="app_version">1.0a</string>
+    <string name="app_version">1.0</string>
     <string name="action_settings">Settings</string>
     <string name="action_stat">Stats</string>
     <string name="action_edit">Edit</string>

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.11.1' apply false
-    id 'com.android.library' version '8.11.1' apply false
-    id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
+    id 'com.android.application' version '8.3.2' apply false
+    id 'com.android.library' version '8.3.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
 }

config/libraries/lib_gadm.json

@@ -1,21 +0,0 @@
-{
-  "uniqueId": "org.gadm:data",
-  "developers": [
-    {
-      "organisationUrl": "https://gadm.org/index.html",
-      "name": "GADM"
-    }
-  ],
-  "artifactVersion": "4.1",
-  "description": "GADM provides maps and spatial data for all countries and their sub-divisions.",
-  "scm": {
-    "connection": "scm:git@github.com:mikepenz/MaterialDrawer.git",
-    "url": "https://github.com/mikepenz/MaterialDrawer",
-    "developerConnection": "scm:git@github.com:mikepenz/MaterialDrawer.git"
-  },
-  "name": "GADM maps and data",
-  "website": "https://gadm.org/index.html",
-  "licenses": [
-    "0151ac7b561a385c536ad4c94532e60b"
-  ]
-}

config/licenses/lic_gadm.json

@@ -1,6 +0,0 @@
-{
-  "content": "<b>The data are freely available for academic use and other non-commercial use. Redistribution or commercial use is not allowed without prior permission.</b>\n\nUsing the data to create maps for publishing of academic research articles is allowed. Thus you can use the maps you made with GADM data for figures in articles published by PLoS, Springer Nature, Elsevier, MDPI, etc. You are allowed (but not required) to publish these articles (and the maps they contain) under an open license such as CC-BY as is the case with PLoS journals and may be the case with other open access articles. <b>Data for the following countries is covered by a a different license</b> <b>Austria</b>: Creative Commons Attribution-ShareAlike 2.0 (source: Government of Ausria)",
-  "hash": "0151ac7b561a385c536ad4c94532e60b",
-  "url": "https://gadm.org/license.html",
-  "name": "GADM license"
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d

gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,7 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +112,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,7 +203,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -213,7 +211,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -70,11 +68,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

metadata/en-US/full_description.txt

@@ -2,10 +2,10 @@ Beans is a scratchmap of the world for Android.
 
 Keep track of your discovery of the world on a colorful visual map.
 
-* Color a map of places based on custom labels
-* Country/State based coloring
-* Single/Multi color modes
-* Different map projections available
-* Small & Fast
-* Statistics (WIP)
-* 100% Free and Open Source software, with no proprietary dependencies
+• Color a map of places based on custom labels
+• Country/State based coloring
+• Single/Multi color modes
+• Different map projections available
+• Small & Fast
+• Statistics (WIP)
+• 100% Free and Open Source software, with no proprietary dependencies

package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "@turf/area": "^7.0.0",
-    "@turf/turf": "^7.0.0",
-    "jsdom": "^26.0.0",
+    "@turf/area": "^6.5.0",
+    "@turf/turf": "^6.5.0",
+    "jsdom": "^24.0.0",
     "mapshaper": "^0.6.79"
   },
   "type": "module"