Merge pull request 'Update dependency mapshaper to v0.7.21' (#507) from renovate/mapshaper-0.x-lockfile into main

.github/workflows/build.yml

@@ -24,6 +24,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0 
     
       - name: set up secrets
         run: |
@@ -49,7 +51,9 @@ jobs:
         uses: gradle/actions/setup-gradle@v6
 
       - name: Build APK
-        run: ./gradlew assembleSignedRelease
+        run: |
+          VERSION_CODE=$(git rev-list --count HEAD)
+          ./gradlew assembleSignedRelease -PVERSION_CODE=$VERSION_CODE
 
       - name: Release
         uses: softprops/action-gh-release@v3

README.md

@@ -5,6 +5,8 @@
   
   <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>

app/build.gradle

@@ -1,21 +1,8 @@
-def getCommitCount() {
-    try {
-        def stdout = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'rev-list', '--count', 'HEAD'
-            standardOutput = stdout
-        }
-        return stdout.toString().trim().toInteger()
-    } catch (ignored) {
-        return 1
-    }
-}
-
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.21'
     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.2.1'
 }
 
 android {
@@ -28,8 +15,8 @@ android {
         applicationId 'net.helcel.beans'
         minSdk = 28
         targetSdk = 37
-        versionName "1.2"
+        versionName "1.3"
-        versionCode getCommitCount()
+        versionCode project.hasProperty('VERSION_CODE') ? project.property('VERSION_CODE').toInteger() : 1
     }
     signingConfigs {
         register("release") {
@@ -118,9 +105,9 @@ dependencies {
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
-    implementation 'com.mikepenz:aboutlibraries:14.2.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-core:14.2.1'
 
 
     implementation platform('androidx.compose:compose-bom:2026.05.01')

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

@@ -9,10 +9,12 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
+import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
@@ -22,6 +24,8 @@ import androidx.compose.material.icons.filled.Settings
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
@@ -51,7 +55,7 @@ class MainScreen : ComponentActivity() {
 
         setContent {
             SysTheme {
-                Box(modifier = Modifier.fillMaxSize().background(MaterialTheme.colors.background)) {
+                Box(modifier = Modifier.fillMaxSize().background(MaterialTheme.colors.background).statusBarsPadding(),) {
                     AppNavHost(psvg, css)
                 }
             }

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

@@ -3,6 +3,7 @@ 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
@@ -24,7 +25,7 @@ const val AUTO_GROUP = -1
 
 
 @Serializable
-class Groups(val id: Int, private val groups: HashMap<Int, Group>) {
+class Groups(val id: Int, @SerialName("grps") private val groups: HashMap<Int, Group>) {
     @kotlinx.serialization.Transient
     private val _groupsFlow = MutableStateFlow<List<Group>>(groups.values.toList())
     @kotlinx.serialization.Transient

app/src/main/res/drawable/ic_launcher_monochrome.xml

@@ -0,0 +1,50 @@
+<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>