From 4e35fa554c8e9de55ac53f4c6e6e2e28af2e44b6 Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Thu, 5 Sep 2024 11:01:52 +0900 Subject: [PATCH 1/3] :sparkles: Since ScreenPreview was not implemented, it was implemented. --- .../droidkaigi/confsched/about/AboutScreen.kt | 44 +++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt b/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt index 0a59750e6..5dc54d44c 100644 --- a/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt +++ b/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt @@ -8,6 +8,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Scaffold import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState +import androidx.compose.material3.Surface import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -24,12 +25,14 @@ import io.github.droidkaigi.confsched.about.section.AboutDroidKaigiDetail import io.github.droidkaigi.confsched.about.section.AboutFooterLinks import io.github.droidkaigi.confsched.about.section.aboutCredits import io.github.droidkaigi.confsched.about.section.aboutOthers +import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme import io.github.droidkaigi.confsched.droidkaigiui.component.AnimatedTextTopAppBar import io.github.droidkaigi.confsched.model.AboutItem import io.github.droidkaigi.confsched.model.AboutItem.Medium import io.github.droidkaigi.confsched.model.AboutItem.X import io.github.droidkaigi.confsched.model.AboutItem.YouTube import org.jetbrains.compose.resources.stringResource +import org.jetbrains.compose.ui.tooling.preview.Preview const val aboutScreenRoute = "about" @@ -65,16 +68,32 @@ data class AboutUiState( val versionName: String, ) -@OptIn(ExperimentalMaterial3Api::class) @Composable fun AboutScreen( - modifier: Modifier = Modifier, - contentPadding: PaddingValues = PaddingValues(), onAboutItemClick: (AboutItem) -> Unit, + contentPadding: PaddingValues = PaddingValues(), ) { val uiState = aboutScreenPresenter() - val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() val snackbarHostState = remember { SnackbarHostState() } + + AboutScreen( + uiState = uiState, + snackbarHostState = snackbarHostState, + contentPadding = contentPadding, + onAboutItemClick = onAboutItemClick, + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AboutScreen( + uiState: AboutUiState, + snackbarHostState: SnackbarHostState, + contentPadding: PaddingValues, + onAboutItemClick: (AboutItem) -> Unit, + modifier: Modifier = Modifier, +) { + val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() val layoutDirection = LocalLayoutDirection.current val lazyListState = rememberLazyListState() @@ -151,3 +170,20 @@ fun AboutScreen( } } } + +@Preview +@Composable +fun AboutScreenPreview() { + KaigiTheme { + Surface { + AboutScreen( + uiState = AboutUiState( + versionName = "1.0", + ), + snackbarHostState = SnackbarHostState(), + contentPadding = PaddingValues(), + onAboutItemClick = {}, + ) + } + } +} From cc810d38fb150cc7ade0967ffa59fe54969db37b Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Fri, 6 Sep 2024 09:44:48 +0900 Subject: [PATCH 2/3] :wrench: I forgot to add the Modifier to the arguments, so I added it. --- .../kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt b/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt index 5dc54d44c..c38635958 100644 --- a/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt +++ b/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt @@ -72,6 +72,7 @@ data class AboutUiState( fun AboutScreen( onAboutItemClick: (AboutItem) -> Unit, contentPadding: PaddingValues = PaddingValues(), + modifier: Modifier = Modifier, ) { val uiState = aboutScreenPresenter() val snackbarHostState = remember { SnackbarHostState() } @@ -81,6 +82,7 @@ fun AboutScreen( snackbarHostState = snackbarHostState, contentPadding = contentPadding, onAboutItemClick = onAboutItemClick, + modifier = modifier, ) } From 73cc6d00d1b782b56b71705c51562ff2a852bb2b Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Fri, 6 Sep 2024 09:47:18 +0900 Subject: [PATCH 3/3] :wrench: ./gradlew detekt --auto-correct --- .../io/github/droidkaigi/confsched/about/AboutScreen.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt b/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt index c38635958..cfd2a717e 100644 --- a/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt +++ b/feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt @@ -71,8 +71,8 @@ data class AboutUiState( @Composable fun AboutScreen( onAboutItemClick: (AboutItem) -> Unit, - contentPadding: PaddingValues = PaddingValues(), modifier: Modifier = Modifier, + contentPadding: PaddingValues = PaddingValues(), ) { val uiState = aboutScreenPresenter() val snackbarHostState = remember { SnackbarHostState() } @@ -91,8 +91,8 @@ fun AboutScreen( fun AboutScreen( uiState: AboutUiState, snackbarHostState: SnackbarHostState, - contentPadding: PaddingValues, onAboutItemClick: (AboutItem) -> Unit, + contentPadding: PaddingValues, modifier: Modifier = Modifier, ) { val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()