Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Feature/#275] animated topAppBar #293

Merged
merged 5 commits into from
Aug 12, 2024
Merged

[Feature/#275] animated topAppBar #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba93752
feature: AnimatedTextTopAppBar
chattymin Aug 11, 2024
43cbf69
feature: apply AnimatedTextTopAppBar
chattymin Aug 11, 2024
dd9d94e
fix: apply detekt
chattymin Aug 11, 2024
263ef8f
Merge branch 'main' into feature/animate-topappbar
takahirom Aug 12, 2024
2757aed
fix: change animation to fade
chattymin Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions ...rc/commonMain/kotlin/io/github/droidkaigi/confsched/ui/component/AnimatedTextTopAppBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package io.github.droidkaigi.confsched.ui.component

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarColors
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.TopAppBarScrollBehavior
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.text.style.TextAlign

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun AnimatedTextTopAppBar(
title: String,
modifier: Modifier = Modifier,
navigationIcon: @Composable () -> Unit = {},
actions: @Composable RowScope.() -> Unit = {},
windowInsets: WindowInsets = TopAppBarDefaults.windowInsets,
colors: TopAppBarColors = TopAppBarDefaults.topAppBarColors(),
scrollBehavior: TopAppBarScrollBehavior? = null,
) {
val scrollFraction = scrollBehavior?.state?.overlappedFraction ?: 0f
val transitionFraction = scrollFraction.coerceIn(0f, 1f)

TopAppBar(
title = {
Box(modifier = Modifier.fillMaxWidth()) {
Text(
text = title,
modifier = Modifier
.fillMaxWidth()
.graphicsLayer {
alpha = 1f - transitionFraction
},
textAlign = TextAlign.Start,
style = MaterialTheme.typography.headlineSmall,
)

Text(
text = title,
modifier = Modifier
.fillMaxWidth()
.align(Alignment.Center)
.graphicsLayer {
alpha = transitionFraction
},
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleMedium,
)
}
},
modifier = modifier,
navigationIcon = navigationIcon,
actions = actions,
windowInsets = windowInsets,
colors = colors,
scrollBehavior = scrollBehavior,
)
}
10 changes: 7 additions & 3 deletions feature/about/src/commonMain/kotlin/io/github/droidkaigi/confsched/about/AboutScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Scaffold
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
Expand All @@ -29,6 +27,7 @@ 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 io.github.droidkaigi.confsched.ui.component.AnimatedTextTopAppBar
import org.jetbrains.compose.resources.stringResource

const val aboutScreenRoute = "about"
Expand Down Expand Up @@ -72,7 +71,12 @@ fun AboutScreen(

Scaffold(
modifier = modifier.testTag(AboutScreenTestTag.Screen),
topBar = { TopAppBar(title = { Text(stringResource(AboutRes.string.about_droidkaigi)) }) },
topBar = {
AnimatedTextTopAppBar(
title = stringResource(AboutRes.string.about_droidkaigi),
scrollBehavior = scrollBehavior,
)
},
snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
contentWindowInsets = WindowInsets(
left = contentPadding.calculateLeftPadding(layoutDirection),
Expand Down
Loading