ui + dependency update

joreilly · May 5, 2024 · 7023abd · 7023abd
1 parent 1b3b3f2
commit 7023abd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/androidApp/src/main/java/dev/johnoreilly/starwars/androidApp/MainActivity.kt b/androidApp/src/main/java/dev/johnoreilly/starwars/androidApp/MainActivity.kt
@@ -7,6 +7,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
@@ -141,7 +142,7 @@ const val PersonListTag = "PersonList"
 
 @Composable
 fun PeopleList(people: List<PersonFragment>) {
-    LazyColumn(modifier = Modifier.testTag(PersonListTag)) {
+    LazyColumn(modifier = Modifier.fillMaxSize().testTag(PersonListTag)) {
         items(people) { person ->
             PersonView(person)
         }
@@ -181,7 +182,7 @@ const val FilmListTag = "FilmList"
 
 @Composable
 fun FilmList(filmList: List<FilmFragment>) {
-    LazyColumn(modifier = Modifier.testTag(FilmListTag)) {
+    LazyColumn(modifier = Modifier.fillMaxSize().testTag(FilmListTag)) {
         items(items = filmList, itemContent = { film ->
             FilmView(film)
         })

diff --git a/compose-web/src/wasmJsMain/kotlin/Main.kt b/compose-web/src/wasmJsMain/kotlin/Main.kt
@@ -1,5 +1,6 @@
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
@@ -175,7 +176,7 @@ const val PersonListTag = "PersonList"
 
 @Composable
 fun PeopleList(people: List<PersonFragment>) {
-    LazyColumn(modifier = Modifier.testTag(PersonListTag)) {
+    LazyColumn(modifier = Modifier.fillMaxSize().testTag(PersonListTag)) {
         items(people) { person ->
             PersonView(person)
         }
@@ -215,7 +216,7 @@ const val FilmListTag = "FilmList"
 
 @Composable
 fun FilmList(filmList: List<FilmFragment>) {
-    LazyColumn(modifier = Modifier.testTag(FilmListTag)) {
+    LazyColumn(modifier = Modifier.fillMaxSize().testTag(FilmListTag)) {
         items(items = filmList, itemContent = { film ->
             FilmView(film)
         })

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ kmpNativeCoroutines = "1.0.0-ALPHA-28-kotlin-2.0.0-RC2"
 androidxActivity = "1.9.0"
 androidxComposeBom = "2024.05.00"
 androidx-navigation = "2.8.0-alpha02"
-androidx-lifecycle = "2.8.0-beta02"
+androidx-lifecycle = "2.8.0-rc01"
 accompanist = "0.30.1"
 horologist = "0.6.10"
 wearCompose = "1.3.1"