Skip to content

Commit af1e4e7

Browse files
authored
Merge pull request #156 from joreilly/ui_updates
ui + dependency update
2 parents 1b3b3f2 + 7023abd commit af1e4e7

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

androidApp/src/main/java/dev/johnoreilly/starwars/androidApp/MainActivity.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.activity.ComponentActivity
77
import androidx.activity.compose.setContent
88
import androidx.compose.foundation.layout.Column
99
import androidx.compose.foundation.layout.Row
10+
import androidx.compose.foundation.layout.fillMaxSize
1011
import androidx.compose.foundation.layout.fillMaxWidth
1112
import androidx.compose.foundation.layout.navigationBarsPadding
1213
import androidx.compose.foundation.layout.padding
@@ -141,7 +142,7 @@ const val PersonListTag = "PersonList"
141142

142143
@Composable
143144
fun PeopleList(people: List<PersonFragment>) {
144-
LazyColumn(modifier = Modifier.testTag(PersonListTag)) {
145+
LazyColumn(modifier = Modifier.fillMaxSize().testTag(PersonListTag)) {
145146
items(people) { person ->
146147
PersonView(person)
147148
}
@@ -181,7 +182,7 @@ const val FilmListTag = "FilmList"
181182

182183
@Composable
183184
fun FilmList(filmList: List<FilmFragment>) {
184-
LazyColumn(modifier = Modifier.testTag(FilmListTag)) {
185+
LazyColumn(modifier = Modifier.fillMaxSize().testTag(FilmListTag)) {
185186
items(items = filmList, itemContent = { film ->
186187
FilmView(film)
187188
})

compose-web/src/wasmJsMain/kotlin/Main.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import androidx.compose.foundation.layout.Column
22
import androidx.compose.foundation.layout.Row
3+
import androidx.compose.foundation.layout.fillMaxSize
34
import androidx.compose.foundation.layout.fillMaxWidth
45
import androidx.compose.foundation.layout.navigationBarsPadding
56
import androidx.compose.foundation.layout.padding
@@ -175,7 +176,7 @@ const val PersonListTag = "PersonList"
175176

176177
@Composable
177178
fun PeopleList(people: List<PersonFragment>) {
178-
LazyColumn(modifier = Modifier.testTag(PersonListTag)) {
179+
LazyColumn(modifier = Modifier.fillMaxSize().testTag(PersonListTag)) {
179180
items(people) { person ->
180181
PersonView(person)
181182
}
@@ -215,7 +216,7 @@ const val FilmListTag = "FilmList"
215216

216217
@Composable
217218
fun FilmList(filmList: List<FilmFragment>) {
218-
LazyColumn(modifier = Modifier.testTag(FilmListTag)) {
219+
LazyColumn(modifier = Modifier.fillMaxSize().testTag(FilmListTag)) {
219220
items(items = filmList, itemContent = { film ->
220221
FilmView(film)
221222
})

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ kmpNativeCoroutines = "1.0.0-ALPHA-28-kotlin-2.0.0-RC2"
1111
androidxActivity = "1.9.0"
1212
androidxComposeBom = "2024.05.00"
1313
androidx-navigation = "2.8.0-alpha02"
14-
androidx-lifecycle = "2.8.0-beta02"
14+
androidx-lifecycle = "2.8.0-rc01"
1515
accompanist = "0.30.1"
1616
horologist = "0.6.10"
1717
wearCompose = "1.3.1"

0 commit comments

Comments
 (0)