From 84dbcb678acfdc8da8148d2bb58501d6bf32d957 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Fri, 6 Jun 2025 22:49:34 +0900 Subject: [PATCH 1/2] Exclude the ime window inset at the snack bar. Change-Id: I14a43609090176604e42caf2862bcb4ba291fe89 --- .../google/samples/apps/nowinandroid/ui/NiaApp.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt index 5a32d4585..f4e7fad7d 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt @@ -21,7 +21,9 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.consumeWindowInsets +import androidx.compose.foundation.layout.exclude import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.ime import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.safeDrawing @@ -167,9 +169,9 @@ internal fun NiaApp( }, label = { Text(stringResource(destination.iconTextId)) }, modifier = - Modifier - .testTag("NiaNavItem") - .then(if (hasUnread) Modifier.notificationDot() else Modifier), + Modifier + .testTag("NiaNavItem") + .then(if (hasUnread) Modifier.notificationDot() else Modifier), ) } }, @@ -185,7 +187,11 @@ internal fun NiaApp( snackbarHost = { SnackbarHost( snackbarHostState, - modifier = Modifier.windowInsetsPadding(WindowInsets.safeDrawing), + modifier = Modifier.windowInsetsPadding( + WindowInsets.safeDrawing.exclude( + WindowInsets.ime, + ), + ), ) }, ) { padding -> From 9b33232fc798af1775f4f2060ea3579480006cc2 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Fri, 6 Jun 2025 22:55:55 +0900 Subject: [PATCH 2/2] Fix spotless. Change-Id: I741418a1e44fd9e3488513bdb33995490738679d --- .../com/google/samples/apps/nowinandroid/ui/NiaApp.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt index f4e7fad7d..b237684ef 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt @@ -168,10 +168,9 @@ internal fun NiaApp( ) }, label = { Text(stringResource(destination.iconTextId)) }, - modifier = - Modifier - .testTag("NiaNavItem") - .then(if (hasUnread) Modifier.notificationDot() else Modifier), + modifier = Modifier + .testTag("NiaNavItem") + .then(if (hasUnread) Modifier.notificationDot() else Modifier), ) } },