Update dependency @turf/turf to v7.3.5

2026-04-25 02:02:14 +00:00
22 changed files with 622 additions and 407 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,8 +24,6 @@ jobs:

    steps:
      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0 

      - name: set up secrets
        run: |
@@ -44,16 +42,14 @@ jobs:
      - name: set up JDK
        uses: actions/setup-java@v5
        with:
-          java-version: 21
+          java-version: 17
          distribution: "temurin"

      - name: Setup Gradle
        uses: gradle/actions/setup-gradle@v6

      - name: Build APK
-        run: |
-          VERSION_CODE=$(git rev-list --count HEAD)
-          ./gradlew assembleSignedRelease -PVERSION_CODE=$VERSION_CODE
+        run: ./gradlew assembleSignedRelease

      - name: Release
        uses: softprops/action-gh-release@v3
--- a/README.md
+++ b/README.md
@@ -5,8 +5,6 @@
  
  <p>A virtual scratchmap of the world</p>
  
-  <a href="https://ko-fi.com/I2I615VP5M"><img src="https://ko-fi.com/img/githubbutton_sm.svg" alt="ko-fi"></a>
-  <br>
  <img src="https://forthebadge.com/images/badges/built-for-android.svg" alt="Built for Android">
  <img src="https://forthebadge.com/images/badges/built-with-love.svg" alt="Built with love">
  <br>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,25 +1,27 @@
 plugins {
    id 'com.android.application'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.21'
+    id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.20'
    id 'org.jetbrains.kotlin.plugin.compose' version '2.3.21'
-    id 'com.mikepenz.aboutlibraries.plugin' version '14.2.0'
+    id 'com.mikepenz.aboutlibraries.plugin' version '14.0.1'
 }

+
 android {
    namespace 'net.helcel.beans'
-    compileSdk = 37
+    compileSdk 36

    defaultConfig {
        buildConfigField("String", "APP_NAME", "\"Beans\"")
        manifestPlaceholders["APP_NAME"] = "Beans"
        applicationId 'net.helcel.beans'
-        minSdk = 28
-        targetSdk = 37
-        versionName "1.3"
-        versionCode project.hasProperty('VERSION_CODE') ? project.property('VERSION_CODE').toInteger() : 1
+        minSdk 28
+        targetSdk 36
+        versionCode 4
+        versionName "1.1a"
    }
    signingConfigs {
-        register("release") {
+        create("release") {
            try {
                def keystorePropertiesFile = rootProject.file("app/keystore.properties")
                def keystoreProperties = new Properties()
@@ -34,18 +36,20 @@ android {
            }
        }
    }
+
+
    buildTypes {
        debug {
            debuggable true
        }
        release {
            minifyEnabled true
-            shrinkResources true
+            shrinkResources false
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
        signedRelease {
            minifyEnabled true
-            shrinkResources true
+            shrinkResources false
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
            signingConfig = signingConfigs.getByName("release")
        }
@@ -74,6 +78,10 @@ android {
        kotlinCompilerExtensionVersion = "2.2.20"
    }

+    kotlin {
+        jvmToolchain(21)
+    }
+
    lint {
        disable 'UsingMaterialAndMaterial3Libraries'
    }
@@ -83,11 +91,12 @@ aboutLibraries {
    library {
        exclusionPatterns = [~"androidx.*", ~"com.google.android.*", ~"org.jetbrains.*"]
    }
+    excludeFields = ["generated"]
 }

 dependencies {
    implementation 'androidx.compose.material3:material3:1.4.0'
-    implementation "androidx.compose.material:material:1.11.2"
+    implementation "androidx.compose.material:material:1.10.6"
    implementation 'androidx.compose.material:material-icons-extended:1.7.8'
    implementation 'androidx.navigation:navigation-compose:2.9.8'
    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
@@ -99,17 +108,17 @@ dependencies {
    implementation "androidx.activity:activity-ktx:1.13.0"

    implementation 'androidx.compose.ui:ui-tooling-preview'
-    implementation 'com.google.android.material:material:1.14.0'
+    implementation 'com.google.android.material:material:1.13.0'
    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0'

    implementation 'com.caverock:androidsvg-aar:1.4'
    implementation 'com.github.chrisbanes:PhotoView:2.3.0'

-    implementation 'com.mikepenz:aboutlibraries:14.2.1'
-    implementation 'com.mikepenz:aboutlibraries-compose-m3:14.2.0'
-    implementation 'com.mikepenz:aboutlibraries-core:14.2.0'
+    implementation 'com.mikepenz:aboutlibraries:14.0.1'
+    implementation 'com.mikepenz:aboutlibraries-compose-m3:14.0.1'
+    implementation 'com.mikepenz:aboutlibraries-core:14.0.1'


-    implementation platform('androidx.compose:compose-bom:2026.05.01')
-    debugImplementation 'androidx.compose.ui:ui-tooling:1.11.2'
+    implementation platform('androidx.compose:compose-bom:2026.04.01')
+    debugImplementation 'androidx.compose.ui:ui-tooling:1.10.6'
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
        android:hardwareAccelerated="false"
        android:icon="@mipmap/ic_launcher_round"
        android:label="${APP_NAME}"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        tools:replace="android:allowBackup">
        <activity
            android:name=".activity.MainScreen"
            android:exported="true">
--- a/app/src/main/java/net/helcel/beans/activity/MainScreen.kt
+++ b/app/src/main/java/net/helcel/beans/activity/MainScreen.kt
@@ -16,6 +16,7 @@ import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.DateRange
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.Percent
 import androidx.compose.material.icons.filled.Settings
--- a/app/src/main/java/net/helcel/beans/activity/SettingsScreen.kt
+++ b/app/src/main/java/net/helcel/beans/activity/SettingsScreen.kt
@@ -152,17 +152,11 @@ fun SettingsMainScreen(onExit: ()->Unit = {}) {
 fun SettingsScreen(navController: NavHostController = settingsNav()) {
    val context = LocalContext.current
    val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-    val keyTheme = stringResource(R.string.key_theme)
-    val defaultTheme = stringResource(R.string.system)
-    val keyProjection = stringResource(R.string.key_projection)
-    val keyGroup = stringResource(R.string.key_group)
-    val offString = stringResource(R.string.off)
-
    var showEdit by remember { mutableStateOf(false) }

-    var theme by remember { mutableStateOf(prefs.getString(keyTheme, defaultTheme)!!) }
-    var projection by remember { mutableStateOf(prefs.getString(keyProjection, "default")!!) }
-    var groups by remember { mutableStateOf(prefs.getString(keyGroup,offString)!!) }
+    var theme by remember { mutableStateOf(prefs.getString(context.getString(R.string.key_theme), context.getString(R.string.system))!!) }
+    var projection by remember { mutableStateOf(prefs.getString(context.getString(R.string.key_projection), "default")!!) }
+    var groups by remember { mutableStateOf(prefs.getString(context.getString(R.string.key_group), context.getString(R.string.off))!!) }

        if(showEdit)
            EditPlaceDialog(true) {
@@ -185,7 +179,7 @@ fun SettingsScreen(navController: NavHostController = settingsNav()) {
                )
                MultiPreference(arrayOf(stringResource(R.string.system),stringResource(R.string.light),stringResource(R.string.dark)), theme) { newTheme ->
                    theme = newTheme
-                    prefs.edit { putString(keyTheme, newTheme) }
+                    prefs.edit { putString(context.getString(R.string.key_theme), newTheme) }
                }
                HorizontalDivider()
            }
@@ -198,7 +192,7 @@ fun SettingsScreen(navController: NavHostController = settingsNav()) {
                )
                MultiPreference(arrayOf(stringResource(R.string.mercator), stringResource(R.string.azimuthalequidistant)), projection) { newProj ->
                    projection = newProj
-                    prefs.edit { putString(keyProjection, newProj) }
+                    prefs.edit { putString(context.getString(R.string.key_projection), newProj) }
                    Settings.refreshProjection()
                }
                HorizontalDivider()
@@ -225,11 +219,11 @@ fun SettingsScreen(navController: NavHostController = settingsNav()) {
                    arrayOf(stringResource(R.string.on), stringResource(R.string.off)),
                    groups
                ) { key ->
-                    if (key == offString) {
+                    if (key == context.getString(R.string.off)) {
                        showDialog=true
                    }
                    groups = key
-                    prefs.edit { putString(keyGroup, key) }
+                    prefs.edit { putString(context.getString(R.string.key_group), key) }
                }
                HorizontalDivider()
            }
@@ -289,13 +283,9 @@ fun SettingsScreen(navController: NavHostController = settingsNav()) {
@Composable
 fun RegionalScreen() {
    val context = LocalContext.current
-
-    val keyRegional = stringResource(R.string.key_regional)
-    val offString = stringResource(R.string.off)
-    val onString = stringResource(R.string.on)
    val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-    var selected by remember {  mutableStateOf(prefs.getString(keyRegional, offString)!!)}
-    var regional by remember{ mutableStateOf(prefs.getString(keyRegional, offString)!!)}
+    var selected by remember {  mutableStateOf(prefs.getString(context.getString(R.string.key_regional),context.getString(R.string.off))!!)}
+    var regional by remember{ mutableStateOf(prefs.getString(context.getString(R.string.key_regional), context.getString(R.string.off))!!)}
    var showDialog by remember{mutableStateOf(false)}
    var showLoad by remember{mutableStateOf(false)}

@@ -315,7 +305,7 @@ fun RegionalScreen() {
                        regional= selected
                        prefs.edit {
                            putString(
-                                keyRegional,
+                                context.getString(R.string.key_regional),
                                regional
                            )
                        }
@@ -342,12 +332,12 @@ fun RegionalScreen() {
    val scope = rememberCoroutineScope()
    MultiPreference(arrayOf(stringResource(R.string.on),stringResource(R.string.off)),regional) { key ->
                when (key) {
-                    offString -> { showDialog=true
+                    context.getString(R.string.off) -> { showDialog=true
                        selected=key
                    }
-                    onString -> {
+                    context.getString(R.string.on) -> {
                        regional = key
-                        prefs.edit { putString(keyRegional, key) }
+                        prefs.edit { putString(context.getString(R.string.key_regional), key) }
                        showLoad=true
                        scope.launch {
                            withContext(Dispatchers.IO) {
@@ -364,7 +354,7 @@ fun RegionalScreen() {
@Composable
 fun MultiPreference(list: Array<String>, selected: String, onSelected: (String) -> Unit) {
    Column(Modifier.padding(2.dp)) {
-        list.forEach { value ->
+        list.map { value ->
            Row(
                verticalAlignment = Alignment.CenterVertically,
                modifier = Modifier
--- a/app/src/main/java/net/helcel/beans/activity/StatsActivity.kt
+++ b/app/src/main/java/net/helcel/beans/activity/StatsActivity.kt
@@ -115,6 +115,7 @@ fun StatsList(activeMode: LocType, countMode: Boolean) {

@Composable
 fun StatsRow(group: Groups.Group, activeMode: LocType, countMode: Boolean) {
+    val context = LocalContext.current

    val visited = remember(group, activeMode) {
        Data.visits.getVisitedByValue(group.key)
@@ -123,18 +124,18 @@ fun StatsRow(group: Groups.Group, activeMode: LocType, countMode: Boolean) {
    val count = when (activeMode) {
        LocType.WORLD -> World.WWW.children.filter { it.code in visited }.size
        LocType.COUNTRY -> World.WWW.children.flatMap { it.children.filter { c -> c.code in visited } }.size
-        LocType.STATE -> World.WWW.children.flatMap { a->a.children.flatMap { b->b.children.filter { c->c.code in visited } } }.size
+        LocType.STATE -> World.WWW.children.flatMap { itc->itc.children.flatMap { it.children.filter { it.code in visited } } }.size
        else -> 0
    }

    val area = when (activeMode) {
        LocType.WORLD -> World.WWW.children.filter { it.code in visited }.sumOf { it.area }
        LocType.COUNTRY -> World.WWW.children.flatMap { it.children.filter { c -> c.code in visited } }.sumOf { it.area }
-        LocType.STATE -> World.WWW.children.flatMap { a->a.children.flatMap { b->b.children.filter { c->c.code in visited } } }.sumOf { it.area }
+        LocType.STATE -> World.WWW.children.flatMap { it.children.flatMap { it.children.filter { it.code in visited } } }.sumOf { it.area }
        else -> 0
    }

-    val displayValue = if (countMode) count.toString() else stringResource(R.string.number_with_unit, area, "km²")
+    val displayValue = if (countMode) count.toString() else context.getString(R.string.number_with_unit, area, "km²")

    val backgroundColor = group.color.color
    val textColor = getContrastColor(backgroundColor)
--- a/app/src/main/java/net/helcel/beans/activity/sub/EditPlaceScreen.kt
+++ b/app/src/main/java/net/helcel/beans/activity/sub/EditPlaceScreen.kt
@@ -58,7 +58,7 @@ fun syncVisited(loc: GeoLoc?=World.WWW){
    loc?.children?.forEach { tt ->
        tt.children.forEach {itc->
            if(Data.visits.getVisited(itc) in listOf(AUTO_GROUP,NO_GROUP)) {
-                if(itc.children.any { c -> Data.visits.getVisited(c) != NO_GROUP })
+                if(itc.children.any { itcc -> Data.visits.getVisited(itcc) != NO_GROUP })
                    Data.visits.setVisited(itc, AUTO_GROUP)
                else
                    Data.visits.setVisited(itc, NO_GROUP)
@@ -126,6 +126,7 @@ fun EditPlaceScreen(loc: GeoLoc, onExit:()->Unit={}) {
                }
            }

+
        LazyColumn(
            modifier = Modifier.fillMaxSize()
        ) {
--- a/app/src/main/java/net/helcel/beans/activity/sub/LicenseScreen.kt
+++ b/app/src/main/java/net/helcel/beans/activity/sub/LicenseScreen.kt
@@ -7,7 +7,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import com.mikepenz.aboutlibraries.ui.compose.DefaultChipColors
 import com.mikepenz.aboutlibraries.ui.compose.DefaultLibraryColors
-import com.mikepenz.aboutlibraries.ui.compose.android.produceLibraries
+import com.mikepenz.aboutlibraries.ui.compose.android.rememberLibraries
 import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
 import net.helcel.beans.R
 import net.helcel.beans.activity.SysTheme
@@ -16,14 +16,14 @@ import net.helcel.beans.activity.SysTheme
@Preview
@Composable
 fun LicenseScreen() {
-    val libraries = produceLibraries(R.raw.aboutlibraries)
+    val libraries = rememberLibraries(R.raw.aboutlibraries)
    SysTheme {
        LibrariesContainer(
            libraries = libraries.value,
            modifier = Modifier.fillMaxSize(),
            colors = DefaultLibraryColors(
-                libraryBackgroundColor = MaterialTheme.colors.background,
-                libraryContentColor = MaterialTheme.colors.onBackground,
+                backgroundColor = MaterialTheme.colors.background,
+                contentColor = MaterialTheme.colors.onBackground,
                licenseChipColors = DefaultChipColors(
                    containerColor = MaterialTheme.colors.primary,
                    contentColor = MaterialTheme.colors.onPrimary,
@@ -37,8 +37,6 @@ fun LicenseScreen() {
                    contentColor = MaterialTheme.colors.onSecondary,
                ),
                dialogConfirmButtonColor = MaterialTheme.colors.primary,
-                dialogBackgroundColor = MaterialTheme.colors.onPrimary,
-                dialogContentColor = MaterialTheme.colors.primary,
            )
        )
    }
--- a/app/src/main/java/net/helcel/beans/countries/Group.kt
+++ b/app/src/main/java/net/helcel/beans/countries/Group.kt
@@ -2,7 +2,6 @@ package net.helcel.beans.countries

 import net.helcel.beans.countries.Country.*

-@Suppress("RedundantSuppression", "SpellCheckingInspection", "unused")
 enum class Group(override val fullName: String, override val children: Set<GeoLoc>) : GeoLoc {

    EEE(
--- a/app/src/main/java/net/helcel/beans/helper/Groups.kt
+++ b/app/src/main/java/net/helcel/beans/helper/Groups.kt
@@ -3,7 +3,6 @@ package net.helcel.beans.helper
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Serializer
 import kotlinx.serialization.json.Json
@@ -25,53 +24,53 @@ const val AUTO_GROUP = -1


@Serializable
-class Groups(val id: Int, @SerialName("grps") private val groups: HashMap<Int, Group>) {
+class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
    @kotlinx.serialization.Transient
-    private val _groupsFlow = MutableStateFlow<List<Group>>(groups.values.toList())
+    private val _groupsFlow = MutableStateFlow<List<Group>>(grps.values.toList())
    @kotlinx.serialization.Transient
    val groupsFlow: StateFlow<List<Group>> = _groupsFlow.asStateFlow()

    fun setGroup(key: Int, name: String, col: ColorDrawable) {
-        groups[key] = Group(key, name, col)
-        _groupsFlow.value = groups.values.toList()
+        grps[key] = Group(key, name, col)
+        _groupsFlow.value = grps.values.toList()
    }

    fun deleteGroup(key: Int) {
-        groups.remove(key)
-        _groupsFlow.value = groups.values.toList()
+        grps.remove(key)
+        _groupsFlow.value = grps.values.toList()
    }

    fun getGroupFromKey(key: Int): Group {
-        return groups.getOrDefault(key, EmptyGroup())
+        return grps.getOrDefault(key, EmptyGroup())
    }

    fun genKey(): Int {
        val key = rnd.nextInt()
-        if (groups.containsKey(key) || key in listOf(NO_GROUP, DEFAULT_GROUP, AUTO_GROUP)) return genKey()
+        if (grps.containsKey(key) || key in listOf(NO_GROUP, DEFAULT_GROUP, AUTO_GROUP)) return genKey()
        return key
    }

    fun size(): Int {
-        return groups.size
+        return grps.size
    }

    fun getUniqueEntry(): Group? {
        assert(size() == 1)
-        return if (groups.size == 1) {
-            groups[groups.keys.first()]
+        return if (grps.size == 1) {
+            grps[grps.keys.first()]
        } else {
            null
        }
    }

    fun getGroupFromPos(pos: Int): Pair<Int, Group> {
-        if(groups.keys.isEmpty()) return Pair(NO_GROUP,Group(NO_GROUP,"-"))
-        val key = groups.keys.toList()[pos]
+        if(grps.keys.isEmpty()) return Pair(NO_GROUP,Group(NO_GROUP,"-"))
+        val key = grps.keys.toList()[pos]
        return Pair(key, getGroupFromKey(key))
    }

    fun findGroupPos(key: Int): Int {
-        return groups.keys.toList().indexOf(key)
+        return grps.keys.toList().indexOf(key)
    }

    class EmptyGroup : Group(0, "")
--- a/app/src/main/res/drawable/ic_launcher_monochrome.xml
+++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml
@@ -1,50 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="128"
-    android:viewportHeight="128">
-    <group android:scaleX="0.8918919"
-        android:scaleY="0.8918919"
-        android:translateX="6.918919"
-        android:translateY="6.918919">
-
-        <group
-            android:scaleX="1.5"
-            android:scaleY="1.5"
-            android:translateX="10"
-            android:translateY="10">
-            <path
-                android:pathData="M36,36m-28,0a28,28 0,1 1,56 0a28,28 0,1 1,-56 0"
-                android:strokeLineJoin="round"
-                android:strokeWidth="2"
-                android:fillColor="@color/blue"
-                android:strokeColor="#000000"
-                android:strokeLineCap="round"/>
-
-        </group>
-        <group
-            android:scaleX="1.25"
-            android:scaleY="1.25"
-            android:translateX="18"
-            android:translateY="18">
-            <path
-                android:pathData="M56.803,45.75c0.599,-0.299 1.157,-0.672 1.663,-1.11 0.804,-0.698 1.463,-1.546 1.94,-2.497 0.599,-1.303 0.883,-2.728 0.829,-4.161 0.034,-1.498 -0.154,-2.994 -0.558,-4.437 -0.451,-1.645 -1.104,-3.229 -1.944,-4.714 -0.967,-2.141 -2.28,-4.108 -3.887,-5.822 -1.242,-1.326 -2.757,-2.366 -4.44,-3.048 -0.877,-0.372 -1.821,-0.56 -2.774,-0.553 -1.402,0.074 -2.729,0.697 -3.882,1.389 -1.285,0.81 -2.244,1.735 -2.771,3.053 -0.739,2.362 0.827,4.821 1.113,5.269 0.003,0.005 0.187,0.281 0.555,0.832 1.512,2.264 1.589,2.358 1.666,2.495 0.646,1.221 1.114,2.528 1.389,3.882 1.043,4.001 1.565,6.001 2.223,6.932 1.208,1.71 3.455,3.414 5.826,3.325 1.059,-0.088 2.093,-0.371 3.05,-0.835Z"
-                android:strokeWidth="2"
-                android:fillColor="@color/white"
-                android:strokeColor="#000000"
-                android:strokeLineCap="round"/>
-            <path
-                android:pathData="M22,41c-1.54,0.554 -2.83,1.642 -3.636,3.066 -0.714,1.365 -0.957,2.928 -0.693,4.445 0.178,1.247 0.632,2.439 1.329,3.488 2.032,3.228 5.383,4.423 7,5 1.613,0.561 3.295,0.897 5,1 2.387,0.205 6.923,0.535 11,-2 1.287,-0.665 2.335,-1.713 3,-3 0.661,-1.601 0.661,-3.399 0,-5 -0.389,-1.156 -1.121,-2.165 -2.099,-2.894 -0.919,-0.599 -1.974,-0.956 -3.069,-1.039 -2.057,-0.313 -2.756,0.139 -5.014,0.057 -1.271,-0.019 -2.534,-0.214 -3.753,-0.577 -3.036,-0.95 -3.33,-2.457 -5.889,-2.829 -1.066,-0.158 -2.155,-0.061 -3.177,0.282Z"
-                android:strokeWidth="2"
-                android:fillColor="@color/white"
-                android:strokeColor="#000000"
-                android:strokeLineCap="round"/>
-            <path
-                android:pathData="M12.7,26.975c1.758,-3.604 5.311,-3.191 9.58,-7.091 2.701,-2.469 2.858,-4.078 5.613,-5.202 1.407,-0.644 2.984,-0.819 4.498,-0.5 2.053,0.475 3.761,1.891 4.61,3.819 1.116,2.742 -0.314,5.437 -1.398,7.482 -0.951,1.689 -2.167,3.215 -3.602,4.518 -1.479,1.552 -3.161,2.898 -5,4 -2.629,1.541 -6.332,3.711 -9.989,2.43 -1.481,-0.548 -2.768,-1.521 -3.699,-2.796 -1.496,-1.906 -1.735,-4.512 -0.612,-6.659Z"
-                android:strokeWidth="2"
-                android:fillColor="@color/white"
-                android:strokeColor="#000000"
-                android:strokeLineCap="round"/>
-        </group>
-    </group>
-</vector>
--- a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@drawable/ic_launcher_background"/>
    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
--- a/build.gradle
+++ b/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 '9.2.1' apply false
-    id 'com.android.library' version '9.2.1' apply false
+    id 'com.android.application' version '9.2.0' apply false
+    id 'com.android.library' version '9.2.0' apply false
    id 'org.jetbrains.kotlin.android' version '2.3.21' apply false
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,24 @@
 # Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 android.enableJetifier=false
+# Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.uniquePackageNames=false
-android.dependency.useConstraints=false
-android.r8.strictFullModeForKeepRules=false
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,10 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
+distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
-retries=0
-retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/2
+++ b/2
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -23,8 +23,8 @@
@rem
@rem ##########################################################################

-@rem Set local scope for the variables, and ensure extensions are enabled
-setlocal EnableExtensions
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2

-"%COMSPEC%" /c exit 1
+goto fail

 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,7 +65,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2

-"%COMSPEC%" /c exit 1
+goto fail

 :execute
@rem Setup the command line
@@ -73,10 +73,21 @@ echo location of your Java installation. 1>&2


@rem Execute Gradle
-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
-@rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

-:exitWithErrorLevel
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
-"%COMSPEC%" /c exit %ERRORLEVEL%
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
  "dependencies": {
-    "@turf/area": "^7.3.5",
-    "@turf/turf": "^7.3.5",
-    "jsdom": "^29.1.1",
-    "mapshaper": "^0.7.19"
+    "@turf/area": "^7.0.0",
+    "@turf/turf": "^7.0.0",
+    "jsdom": "^29.0.0",
+    "mapshaper": "^0.7.0"
  },
  "type": "module"
 }
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,9 +6,6 @@ pluginManagement {
        maven { url 'https://jitpack.io' }
    }
 }
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
-}
 dependencyResolutionManagement {
    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
    repositories {
--- a/yarn.lock
+++ b/yarn.lock