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

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0 
     

app/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.plugin.serialization' version '2.4.0'
     id 'org.jetbrains.kotlin.plugin.compose' version '2.4.0'
-    id 'com.mikepenz.aboutlibraries.plugin' version '14.2.1'
+    id 'com.mikepenz.aboutlibraries.plugin' version '15.0.3'
 }
 
 android {
@@ -15,7 +15,7 @@ android {
         applicationId 'net.helcel.beans'
         minSdk = 28
         targetSdk = 37
-        versionName "1.3"
+        versionName "1.3b"
         versionCode project.hasProperty('VERSION_CODE') ? project.property('VERSION_CODE').toInteger() : 1
     }
     signingConfigs {
@@ -87,7 +87,7 @@ aboutLibraries {
 
 dependencies {
     implementation 'androidx.compose.material3:material3:1.4.0'
-    implementation "androidx.compose.material:material:1.11.2"
+    implementation "androidx.compose.material:material:1.11.4"
     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'
@@ -106,12 +106,12 @@ dependencies {
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
     implementation 'com.mikepenz:aboutlibraries:14.2.1'
-    implementation 'com.mikepenz:aboutlibraries-compose-m3:14.2.1'
+    implementation 'com.mikepenz:aboutlibraries-compose-m3:15.0.3'
-    implementation 'com.mikepenz:aboutlibraries-core:14.2.1'
+    implementation 'com.mikepenz:aboutlibraries-core:15.0.3'
 
 
-    implementation platform('androidx.compose:compose-bom:2026.05.01')
+    implementation platform('androidx.compose:compose-bom:2026.06.01')
-    debugImplementation 'androidx.compose.ui:ui-tooling:1.11.2'
+    debugImplementation 'androidx.compose.ui:ui-tooling:1.11.4'
 }
 
 tasks.configureEach { task ->

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

@@ -50,8 +50,8 @@ class MainScreen : ComponentActivity() {
         super.onCreate(savedInstanceState)
         actionBar?.hide()
         Settings.start(this)
-        GeoLocImporter.importStates(this)
         Data.loadData(this, Int.MIN_VALUE)
+        GeoLocImporter.importStates(this)
 
         setContent {
             SysTheme {

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

@@ -168,8 +168,10 @@ fun SettingsScreen(navController: NavHostController = settingsNav()) {
             EditPlaceDialog(true) {
                 showEdit = false
                 val g = Data.selected_group
-                if (it && g != null)
+                if (it && g != null) {
                     Data.visits.reassignAllVisitedToGroup(g.key)
+                    Data.saveData()
+                }
             }
 
         LazyColumn(
@@ -216,8 +218,10 @@ fun SettingsScreen(navController: NavHostController = settingsNav()) {
                         deleteMode = true,
                         onDismiss = {
                             val g = Data.selected_group
-                            if (g != null)
+                            if (g != null) {
                                 Data.visits.reassignAllVisitedToGroup(g.key)
+                                Data.saveData()
+                            }
                             showDialog = false
                         })
                 }

app/src/main/java/net/helcel/beans/activity/sub/EditPlaceScreen.kt

@@ -54,27 +54,51 @@ fun EditPlaceScreenPreview(){
     EditPlaceScreen(Group.EEE)
 }
 
-fun syncVisited(loc: GeoLoc?=World.WWW){
+fun syncVisited(loc: GeoLoc?=World.WWW): Boolean {
+    var changed = false
     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 })
+                val newState = if(itc.children.any { c -> Data.visits.getVisited(c) != NO_GROUP })
-                    Data.visits.setVisited(itc, AUTO_GROUP)
+                    AUTO_GROUP
                 else
-                    Data.visits.setVisited(itc, NO_GROUP)
+                    NO_GROUP
+
+                if (Data.visits.getVisited(itc) != newState) {
+                    Data.visits.setVisited(itc, newState)
+                    changed = true
+                }
             }
         }
         if(Data.visits.getVisited(tt) in listOf(AUTO_GROUP,NO_GROUP)) {
-            if(tt.children.any { itc -> Data.visits.getVisited(itc) != NO_GROUP })
+            val newState = if(tt.children.any { itc -> Data.visits.getVisited(itc) != NO_GROUP })
-                Data.visits.setVisited(tt, AUTO_GROUP)
+                AUTO_GROUP
             else
-                Data.visits.setVisited(tt, NO_GROUP)
+                NO_GROUP
+
+            if (Data.visits.getVisited(tt) != newState) {
+                Data.visits.setVisited(tt, newState)
+                changed = true
             }
         }
     }
+    // Sync World from Continents
+    if (loc != null && Data.visits.getVisited(loc) in listOf(AUTO_GROUP, NO_GROUP)) {
+        val newState = if(loc.children.any { Data.visits.getVisited(it) != NO_GROUP })
+            AUTO_GROUP
+        else
+            NO_GROUP
+        if (Data.visits.getVisited(loc) != newState) {
+            Data.visits.setVisited(loc, newState)
+            changed = true
+        }
+    }
+    return changed
+}
 
 @Composable
 fun EditPlaceScreen(loc: GeoLoc, onExit:()->Unit={}) {
+    val visits by Data.visits.visitsFlow.collectAsState()
     var showEdit by remember { mutableStateOf(false) }
     val tabs : SnapshotStateList<GeoLoc> = remember { mutableStateListOf(loc) }
     val ctx = LocalContext.current
@@ -84,7 +108,12 @@ fun EditPlaceScreen(loc: GeoLoc, onExit:()->Unit={}) {
         selectedTab = tabs.lastIndex
     }
     SideEffect {
-        syncVisited()
+        // visits is used to trigger sync whenever data changes
+        if (visits.isNotEmpty() || true) {
+            if (syncVisited()) {
+                Data.saveData()
+            }
+        }
     }
     BackHandler {
         if (tabs.size > 1) tabs.removeAt(tabs.lastIndex)
@@ -95,6 +124,7 @@ fun EditPlaceScreen(loc: GeoLoc, onExit:()->Unit={}) {
             showEdit = false
             if (it) {
                 Data.visits.setVisited(Data.selected_geoloc, NO_GROUP)
+                syncVisited()
                 Data.saveData()
 
                 if (Data.selected_geoloc!=null && Data.selected_geoloc!!.children.any { itc-> Data.visits.getVisited(itc) != NO_GROUP }) {
@@ -103,6 +133,7 @@ fun EditPlaceScreen(loc: GeoLoc, onExit:()->Unit={}) {
             }
             if (Data.selected_group != null && Data.selected_geoloc != null) {
                 Data.visits.setVisited(Data.selected_geoloc, Data.selected_group!!.key)
+                syncVisited()
                 Data.saveData()
             }
             Data.selected_geoloc = null
@@ -144,12 +175,14 @@ fun EditPlaceScreen(loc: GeoLoc, onExit:()->Unit={}) {
                                         Data.visits.getVisited(itc)!= NO_GROUP } == true) AUTO_GROUP
                                 else NO_GROUP
                             )
+                            Data.saveData()
                             Data.selected_group = null
                         } else {
                             Data.selected_group = null
                             showEdit=true
                         }
-
+                        syncVisited()
+                        Data.saveData()
                     })
 
             }

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

@@ -43,14 +43,14 @@ object Data {
         if (groups.size() == 0) {
             groups.setGroup(DEFAULT_GROUP, "Visited",
                 ContextCompat.getColor(ctx, R.color.blue).toDrawable())
-            saveData()
         }
+        saveData()
     }
 
     fun saveData() {
         if(groups.id != visits.id) return
         val id = groups.id
-        sharedPreferences.edit {
+        sharedPreferences.edit(commit=true) {
             putString("groups_$id", groupsSerial.writeTo(groups))
             putString("visits_$id", visitsSerial.writeTo(visits))
         }

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

@@ -32,12 +32,18 @@ class Groups(val id: Int, @SerialName("grps") private val groups: HashMap<Int, G
     val groupsFlow: StateFlow<List<Group>> = _groupsFlow.asStateFlow()
 
     fun setGroup(key: Int, name: String, col: ColorDrawable) {
+        val old = groups[key]
+        if (old != null && old.name == name && old.color.color == col.color) return
         groups[key] = Group(key, name, col)
-        _groupsFlow.value = groups.values.toList()
+        updateFlow()
     }
 
     fun deleteGroup(key: Int) {
         groups.remove(key)
+        updateFlow()
+    }
+
+    private fun updateFlow() {
         _groupsFlow.value = groups.values.toList()
     }
 

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

@@ -19,24 +19,25 @@ class Visits(val id: Int, private val locs: HashMap<String, Int>) {
     val visitsFlow: StateFlow<Map<String,Int>> = _visitsFlow
 
     fun setVisited(key: GeoLoc?, b: Int) {
-        if (key == null)
+        if (key == null || locs[key.code] == b)
             return
-        _visitsFlow.value = _visitsFlow.value.toMutableMap().apply {
-            this[key.code] = b
-        }
         locs[key.code] = b
+        updateFlow()
+    }
+
+    private fun updateFlow() {
+        _visitsFlow.value = locs.toMap()
     }
 
     fun deleteVisited(key: Int) {
         val keysToDelete = locs
             .filter { it.value == key }
             .map { it.key }
-        _visitsFlow.value = _visitsFlow.value.toMutableMap().apply {
+        if (keysToDelete.isEmpty()) return
-            keysToDelete.forEach { this.remove(it)}
-        }
         keysToDelete.forEach {
             locs.remove(it)
         }
+        updateFlow()
     }
 
     fun getVisited(key: GeoLoc): Int {
@@ -60,13 +61,19 @@ class Visits(val id: Int, private val locs: HashMap<String, Int>) {
     }
 
     fun reassignAllVisitedToGroup(group: Int) {
+        var changed = false
         val keys = locs.filter { (_, grp) ->
             grp !in listOf(NO_GROUP, AUTO_GROUP)
         }.keys
         keys.forEach {
+            if (locs[it] != group) {
                 locs[it] = group
+                changed = true
+            }
+        }
+        if (changed) {
+            updateFlow()
         }
-        _visitsFlow.value = locs
     }
 
     @OptIn(ExperimentalSerializationApi::class)

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f
+distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

gradlew

@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:

gradlew.bat

@@ -19,7 +19,7 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
@@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2
 
 
 
-@rem Execute Gradle
+@rem Execute gradlew
 @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