From 067e041cd48b426cc6561ecb8b98444164ab7ab5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:44:06 +0000 Subject: [PATCH 1/2] build(deps): bump io.nlopez.compose.rules:detekt from 0.4.5 to 0.4.8 Bumps [io.nlopez.compose.rules:detekt](https://github.com/mrmans0n/compose-rules) from 0.4.5 to 0.4.8. - [Release notes](https://github.com/mrmans0n/compose-rules/releases) - [Commits](https://github.com/mrmans0n/compose-rules/compare/v0.4.5...v0.4.8) --- updated-dependencies: - dependency-name: io.nlopez.compose.rules:detekt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ea1b615..6174e58 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ voyager = "1.0.0" [libraries] appdirs = "ca.gosyer:kotlin-multiplatform-appdirs:1.2.0" -detekt-compose = "io.nlopez.compose.rules:detekt:0.4.5" +detekt-compose = "io.nlopez.compose.rules:detekt:0.4.8" detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" } flatlaf = "com.formdev:flatlaf:3.5" joda-time = "joda-time:joda-time:2.12.7" From f3c6922ea5ed0d95c4f625a3664df5d8bf24fc27 Mon Sep 17 00:00:00 2001 From: Messias Junior Date: Thu, 1 Aug 2024 14:49:25 +0100 Subject: [PATCH 2/2] fix: error screen --- .../feature/common/composable/Error.kt | 19 +++++++++++++++++-- .../wishlist/composable/WishlistContent.kt | 12 ++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/appoutlet/gameoutlet/feature/common/composable/Error.kt b/src/main/kotlin/appoutlet/gameoutlet/feature/common/composable/Error.kt index b427e15..2e5c2ce 100644 --- a/src/main/kotlin/appoutlet/gameoutlet/feature/common/composable/Error.kt +++ b/src/main/kotlin/appoutlet/gameoutlet/feature/common/composable/Error.kt @@ -1,5 +1,6 @@ package appoutlet.gameoutlet.feature.common.composable +import androidx.compose.desktop.ui.tooling.preview.Preview import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -12,7 +13,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag +import androidx.compose.ui.text.style.TextAlign import appoutlet.gameoutlet.core.translation.i18n +import appoutlet.gameoutlet.core.ui.GameOutletTheme import appoutlet.gameoutlet.core.ui.spacing @Composable @@ -34,13 +37,16 @@ fun Error( style = MaterialTheme.typography.titleLarge ) + Spacer(modifier = Modifier.height(MaterialTheme.spacing.medium)) + Text( modifier = Modifier.semantics { testTag = "message" }, text = message, - style = MaterialTheme.typography.bodyMedium + style = MaterialTheme.typography.bodyMedium, + textAlign = TextAlign.Center ) - Spacer(modifier = Modifier.height(MaterialTheme.spacing.medium)) + Spacer(modifier = Modifier.height(MaterialTheme.spacing.large)) onTryAgain?.let { Button(modifier = Modifier.semantics { testTag = "button" }, onClick = onTryAgain) { @@ -49,3 +55,12 @@ fun Error( } } } + +@Composable +@Preview +private fun ErrorPreview() { + GameOutletTheme { + Error { + } + } +} diff --git a/src/main/kotlin/appoutlet/gameoutlet/feature/wishlist/composable/WishlistContent.kt b/src/main/kotlin/appoutlet/gameoutlet/feature/wishlist/composable/WishlistContent.kt index 3546acc..813c3bf 100644 --- a/src/main/kotlin/appoutlet/gameoutlet/feature/wishlist/composable/WishlistContent.kt +++ b/src/main/kotlin/appoutlet/gameoutlet/feature/wishlist/composable/WishlistContent.kt @@ -69,12 +69,12 @@ private fun WishlistGames( onInputEvent = onInputEvent, ) } - } - } - - if (uiState.list.isEmpty()) { - Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { - WishlistEmptyList(onInputEvent = onInputEvent) + } else { + item { + Box(contentAlignment = Alignment.Center) { + WishlistEmptyList(onInputEvent = onInputEvent) + } + } } } }