diff --git a/androidApp/src/main/java/dev/johnoreilly/starwars/androidApp/MainActivity.kt b/androidApp/src/main/java/dev/johnoreilly/starwars/androidApp/MainActivity.kt index 7da8eec..4085281 100644 --- 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) { - 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) { - 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 index a21def1..419442a 100644 --- 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) { - 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) { - 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 index b580c1b..634b74a 100644 --- 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"