version updates

joreilly · Dec 20, 2023 · d4c1f24 · d4c1f24
1 parent 0b0a173
commit d4c1f24
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 58 deletions.
diff --git a/app/src/main/java/com/surrus/peopleinspace/personlist/PersonListScreen.kt b/app/src/main/java/com/surrus/peopleinspace/personlist/PersonListScreen.kt
@@ -4,24 +4,30 @@
 
 package com.surrus.peopleinspace.personlist
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.LocalContentAlpha
-import androidx.compose.material.pullrefresh.*
-import androidx.compose.material3.*
-import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.testTag
@@ -35,14 +41,13 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil.compose.AsyncImage
 import com.surrus.common.remote.Assignment
-import com.surrus.peopleinspace.R
 import com.surrus.peopleinspace.ui.PersonProvider
-import com.surrus.peopleinspace.ui.PurpleGray50
+import org.koin.androidx.compose.getViewModel
+import com.surrus.peopleinspace.R
 import com.surrus.peopleinspace.ui.component.PeopleInSpaceGradientBackground
 import com.surrus.peopleinspace.ui.component.PeopleInSpaceTopAppBar
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import org.koin.androidx.compose.getViewModel
 
 const val PersonListTag = "PersonList"
 
@@ -95,8 +100,7 @@ fun PersonListScreen(
 
             Box(Modifier.pullRefresh(state)) {
                 LazyColumn(
-                    modifier = Modifier
-                        .testTag(PersonListTag)
+                    modifier = Modifier.testTag(PersonListTag)
                         .padding(innerPadding)
                         .consumeWindowInsets(innerPadding)
                         .fillMaxSize()
@@ -116,43 +120,33 @@ fun PersonListScreen(
 
 @Composable
 fun PersonView(person: Assignment, personSelected: (person: String) -> Unit) {
-    Card(
+
+    Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(8.dp),
-        elevation = CardDefaults.cardElevation(defaultElevation = 6.dp)
+            .clickable(onClick = { personSelected(person.name) })
+            .padding(16.dp),
+        verticalAlignment = Alignment.CenterVertically
     ) {
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .clickable(onClick = { personSelected(person.name) })
-                .padding(16.dp),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-
-            val personImageUrl = person.personImageUrl ?: ""
-            if (personImageUrl.isNotEmpty()) {
-                AsyncImage(
-                    model = person.personImageUrl,
-                    contentDescription = person.name,
-                    contentScale = ContentScale.Fit,
-                    modifier = Modifier
-                        .size(60.dp)
-                        .clip(CircleShape)
-                        .background(color = PurpleGray50)
-                )
-            } else {
-                Spacer(modifier = Modifier.size(60.dp))
-                CircularProgressIndicator()
-            }
 
-            Spacer(modifier = Modifier.size(12.dp))
+        val personImageUrl = person.personImageUrl ?: ""
+        if (personImageUrl.isNotEmpty()) {
+            AsyncImage(
+                model = person.personImageUrl,
+                contentDescription = person.name,
+                contentScale = ContentScale.Fit,
+                modifier = Modifier.size(60.dp)
+            )
+        } else {
+            Spacer(modifier = Modifier.size(60.dp))
+        }
 
-            Column {
-                Text(text = person.name, style = TextStyle(fontSize = 20.sp))
-                CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
-                    Text(text = person.craft, style = TextStyle(fontSize = 14.sp))
-                }
+        Spacer(modifier = Modifier.size(12.dp))
+
+        Column {
+            Text(text = person.name, style = TextStyle(fontSize = 20.sp))
+            CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+                Text(text = person.craft, style = TextStyle(fontSize = 14.sp))
             }
         }
     }

diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -22,7 +22,7 @@ kotlin {
             implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6")
             implementation("io.ktor:ktor-server-content-negotiation:2.3.6")
 
-            implementation("ch.qos.logback:logback-classic:1.2.3")
+            implementation("ch.qos.logback:logback-classic:1.4.14")
 
             implementation(project(":common"))
         }

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     id("app.cash.sqldelight")
     id("com.google.devtools.ksp")
     id("com.rickclephas.kmp.nativecoroutines")
-    id("io.github.luca992.multiplatform-swiftpackage") version "2.2.0"
+    id("io.github.luca992.multiplatform-swiftpackage") version "2.2.1"
 }
 
 android {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,22 +1,22 @@
 [versions]
 kotlin = "1.9.21"
-ksp = "1.9.21-1.0.15"
+ksp = "1.9.21-1.0.16"
 coroutines = "1.8.0-RC"
 kotlinxSerialization = "1.6.2"
 kotlinxDateTime = "0.5.0"
 androidGradlePlugin = "8.2.0"
-koin = "3.5.0"
-koinCompose = "3.5.0"
-ktor = "2.3.6"
+koin = "3.5.3"
+koinCompose = "3.5.3"
+ktor = "2.3.7"
 slf4j = "2.0.9"
-sqlDelight = "2.0.0"
-kmpNativeCoroutines = "1.0.0-ALPHA-22"
+sqlDelight = "2.0.1"
+kmpNativeCoroutines = "1.0.0-ALPHA-23"
 
-androidxActivity = "1.8.1"
+androidxActivity = "1.8.2"
 androidxComposeCompiler = "1.5.5-dev-k1.9.21-163bb051fe5"
 jbComposeCompiler = "1.5.4"
 androidxComposeBom = "2023.10.01"
-androidxNavigationCompose = "2.7.5"
+androidxNavigationCompose = "2.7.6"
 wearCompose = "1.2.1"
 androidxLifecycle = "2.6.2"
 imageLoader = "1.7.1"
@@ -25,7 +25,7 @@ osmdroidAndroid = "6.1.17"
 composeMultiplatform = "1.6.0-alpha01"
 accompanist = "0.32.0"
 coilCompose = "2.5.0"
-horologist = "0.5.10"
+horologist = "0.5.14"
 glanceWearTiles = "1.0.0-alpha05"
 glanceAppWidget = "1.0.0"
 
@@ -38,7 +38,7 @@ mockito = "3.11.2"
 multiplatformSettings = "1.1.1"
 kermit = "2.0.2"
 
-gradleVersionsPlugin = "0.39.0"
+gradleVersionsPlugin = "0.50.0"
 shadowPlugin = "7.0.0"
 kotlinterGradle = "3.4.5"
 
@@ -108,7 +108,7 @@ ktor-client-darwin = { group = "io.ktor", name = "ktor-client-darwin", version.r
 ktor-client-java = { group = "io.ktor", name = "ktor-client-java", version.ref = "ktor" }
 ktor-client-js = { group = "io.ktor", name = "ktor-client-js", version.ref = "ktor" }
 
-okhttp = { module = "com.squareup.okhttp3:okhttp", version = "4.9.2" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version = "4.12.0" }
 loggingInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version = "4.9.2" }
 
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }

diff --git a/graphql-server/build.gradle.kts b/graphql-server/build.gradle.kts
@@ -21,7 +21,7 @@ kotlin {
         implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")
         implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
 
-        implementation("ch.qos.logback:logback-classic:1.2.3")
+        implementation("ch.qos.logback:logback-classic:1.4.14")
 
         implementation(project(":common"))
       }