Merge pull request #432 from joreilly/dependency_updates

dependency updates + some cleanup

Author: joreilly

common/src/commonMain/kotlin/com/surrus/common/repository/PeopleInSpaceRepository.kt

@@ -32,16 +32,14 @@ class PeopleInSpaceRepository(
 
     init {
         coroutineScope.launch {
-            // TODO figure out cleaner place to invoke this
+            // TODO figure out cleaner place to invoke this (needed for web implementatin)
             PeopleInSpaceDatabase.Schema.awaitCreate(peopleInSpaceDatabase.driver)
             fetchAndStorePeople()
         }
     }
 
     override fun fetchPeopleAsFlow(): Flow<List<Assignment>> {
-        // the main reason we need to do this check is that sqldelight isn't currently
-        // setup for javascript client
-        return peopleInSpaceQueries?.selectAll(
+        return peopleInSpaceQueries.selectAll(
             mapper = { name, craft, personImageUrl, personBio ->
                 Assignment(
                     name = name,
@@ -50,7 +48,7 @@ class PeopleInSpaceRepository(
                     personBio = personBio
                 )
             }
-        )?.asFlow()?.mapToList(Dispatchers.Default) ?: flowOf(emptyList())
+        ).asFlow().mapToList(Dispatchers.Default)
     }
 
     override suspend fun fetchAndStorePeople() {
@@ -60,8 +58,7 @@ class PeopleInSpaceRepository(
 
             // this is very basic implementation for now that removes all existing rows
             // in db and then inserts results from api request
-            // using "transaction" accelerate the batch of queries, especially inserting
-            peopleInSpaceQueries?.transaction {
+            peopleInSpaceQueries.transaction {
                 peopleInSpaceQueries.deleteAll()
                 result.people.forEach {
                     peopleInSpaceQueries.insertItem(
@@ -84,9 +81,14 @@ class PeopleInSpaceRepository(
     override fun pollISSPosition(): Flow<IssPosition> {
         return flow {
             while (true) {
-                val position = peopleInSpaceApi.fetchISSPosition().iss_position
-                emit(position)
-                logger.d { position.toString() }
+                try {
+                    val position = peopleInSpaceApi.fetchISSPosition().iss_position
+                    emit(position)
+                    logger.d { position.toString() }
+                } catch (e: Exception) {
+                    // TODO report error up to UI
+                    logger.w(e) { "Exception during pollISSPosition: $e" }
+                }
                 delay(POLL_INTERVAL)
             }
         }

common/src/commonMain/kotlin/com/surrus/common/ui/ISSPositionContent.kt

@@ -71,14 +71,15 @@ fun ISSPositionContent(viewModel: ISSPositionViewModel) {
             }
         }
 
-        Spacer(Modifier.height(16.dp))
+        //Spacer(Modifier.height(16.dp))
 
         // Map view takes the remaining space
         ISSMapView(
             Modifier
                 .fillMaxHeight()
                 .fillMaxWidth()
-                .clip(RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)),
+                .padding(16.dp)
+                .clip(RoundedCornerShape(8.dp)),
             viewModel
         )
     }
@@ -89,7 +90,7 @@ fun CoordinateDisplay(label: String, value: String, modifier: Modifier = Modifie
     Box(
         modifier = modifier
             .background(
-                color = MaterialTheme.colorScheme.primaryContainer,
+                color = MaterialTheme.colorScheme.background,
                 shape = RoundedCornerShape(8.dp)
             )
             .padding(12.dp),
@@ -99,7 +100,7 @@ fun CoordinateDisplay(label: String, value: String, modifier: Modifier = Modifie
             Text(
                 text = label,
                 style = MaterialTheme.typography.labelMedium,
-                color = MaterialTheme.colorScheme.onPrimaryContainer
+                color = MaterialTheme.colorScheme.onBackground
             )
 
             Spacer(Modifier.height(4.dp))
@@ -108,7 +109,7 @@ fun CoordinateDisplay(label: String, value: String, modifier: Modifier = Modifie
                 text = value,
                 style = MaterialTheme.typography.titleLarge,
                 fontWeight = FontWeight.Bold,
-                color = MaterialTheme.colorScheme.onPrimaryContainer
+                color = MaterialTheme.colorScheme.onBackground
             )
         }
     }

gradle/libs.versions.toml

@@ -6,10 +6,8 @@ compose-multiplatform = "1.8.2"
 composeUiTooling = "1.4.1"
 coroutines = "1.10.2"
 kotlinxSerialization = "1.9.0"
-androidGradlePlugin = "8.12.1"
-koin = "4.1.0"
-koinCompose = "4.1.0"
-koinComposeMultiplatform = "4.1.0"
+androidGradlePlugin = "8.12.2"
+koin = "4.1.1"
 ktor = "3.2.3"
 osmdroidAndroid = "6.1.20"
 osmAndroidCompose = "0.0.5"
@@ -20,14 +18,14 @@ webPackPlugin = "9.1.0"
 
 
 androidxActivity = "1.10.1"
-androidxComposeBom = "2025.08.00"
+androidxComposeBom = "2025.08.01"
 material3-adaptive = "1.1.0"
 material3-adaptive-navigation-suite = "1.3.2"
 androidxNavigationCompose = "2.9.3"
 uiToolingPreview = "1.9.0"
 wearCompose = "1.4.1"
-androidxLifecycle = "2.9.2"
-androidxLifecycleKMP = "2.9.2"
+androidxLifecycle = "2.9.3"
+androidxLifecycleKMP = "2.9.3"
 
 coilCompose = "2.7.0"
 coilCompose3 = "3.3.0"
@@ -39,7 +37,7 @@ okhttp = "5.1.0"
 kermit = "2.0.8"
 
 gradleVersionsPlugin = "0.52.0"
-shadowPlugin = "9.0.2"
+shadowPlugin = "9.1.0"
 skie = "0.10.6"
 
 mcp = "0.6.0"
@@ -107,11 +105,11 @@ glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref =
 androidx-navigation-compose-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidxNavigationCompose" }
 
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
-koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koinCompose" }
+koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" }
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
 koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koin" }
-koin-compose-multiplatform = { module = "io.insert-koin:koin-compose", version.ref = "koinComposeMultiplatform" }
+koin-compose-multiplatform = { module = "io.insert-koin:koin-compose", version.ref = "koin" }
 
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
 ktor-client-json = { group = "io.ktor", name = "ktor-client-json", version.ref = "ktor" }