From 87c7ec865721c575b838fdd1701c5c43558f57fc Mon Sep 17 00:00:00 2001 From: takarabe-hamuyatti Date: Wed, 28 Aug 2024 11:57:20 +0900 Subject: [PATCH 1/2] add padding to staff and contributor list bottom area --- .../droidkaigi/confsched/contributors/ContributorsScreen.kt | 3 ++- .../io/github/droidkaigi/confsched/staff/StaffScreen.kt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt b/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt index 28a0a13af..2d789ab48 100644 --- a/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt +++ b/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt @@ -17,6 +17,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.platform.testTag +import androidx.compose.ui.unit.dp import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable import io.github.droidkaigi.confsched.compose.rememberEventEmitter @@ -117,7 +118,7 @@ fun ContributorsScreen( Contributors( contributors = uiState.contributors, onContributorsItemClick = onContributorsItemClick, - contentPadding = PaddingValues(bottom = padding.calculateBottomPadding()), + contentPadding = PaddingValues(bottom = 40.dp + padding.calculateBottomPadding()), modifier = Modifier .fillMaxSize() .padding(top = padding.calculateTopPadding()) diff --git a/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt b/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt index e6ea5e6fd..ed39236b8 100644 --- a/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt +++ b/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt @@ -18,6 +18,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.platform.testTag +import androidx.compose.ui.unit.dp import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable import io.github.droidkaigi.confsched.compose.rememberEventEmitter @@ -30,6 +31,7 @@ import io.github.droidkaigi.confsched.ui.UserMessageStateHolder import io.github.droidkaigi.confsched.ui.UserMessageStateHolderImpl import io.github.droidkaigi.confsched.ui.component.AnimatedLargeTopAppBar import io.github.droidkaigi.confsched.ui.handleOnClickIfNotNavigating +import io.github.droidkaigi.confsched.ui.plus import kotlinx.collections.immutable.PersistentList import org.jetbrains.compose.ui.tooling.preview.Preview @@ -130,7 +132,7 @@ fun StaffScreen( } } .testTag(StaffScreenLazyColumnTestTag), - contentPadding = PaddingValues(bottom = padding.calculateBottomPadding()), + contentPadding = PaddingValues(bottom = 40.dp + padding.calculateBottomPadding()), ) { items(uiState.staff) { staff -> StaffItem( From 0cb3ba77ddf9e9c819516a52ec8b7287c6d67949 Mon Sep 17 00:00:00 2001 From: takarabe-hamuyatti Date: Mon, 2 Sep 2024 11:56:13 +0900 Subject: [PATCH 2/2] delete unused import --- .../droidkaigi/confsched/contributors/ContributorsScreen.kt | 3 +-- .../kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt b/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt index 14627a5b7..33f184a2b 100644 --- a/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt +++ b/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt @@ -16,9 +16,8 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.testTag -import androidx.lifecycle.compose.dropUnlessResumed import androidx.compose.ui.unit.dp -import androidx.lifecycle.compose.LocalLifecycleOwner +import androidx.lifecycle.compose.dropUnlessResumed import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable import conference_app_2024.feature.contributors.generated.resources.contributor_title diff --git a/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt b/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt index 389dc8171..4a2efe2dc 100644 --- a/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt +++ b/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt @@ -17,9 +17,8 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.testTag -import androidx.lifecycle.compose.dropUnlessResumed -import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.dropUnlessResumed import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable import conference_app_2024.feature.staff.generated.resources.staff_title