vaultwarden/keyguard-app-Bitwarden-Vaultwarden
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Animate navigation bar color change

Browse Source
This commit is contained in:
Artem Chepurnoy 2024-02-18 11:49:03 +02:00
parent 90c8b7e3ba
commit 324abebb88
No known key found for this signature in database
GPG Key ID: FAC37D0CF674043E
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/androidMain/kotlin/com/artemchep/keyguard/android/BaseActivity.kt
View File

@ -102,6 +102,7 @@ abstract class BaseActivity : AppCompatActivity(), DIAware {
setContent { setContent {
KeyguardTheme { KeyguardTheme {
val containerColor = LocalBackgroundManager.current.colorHighest val containerColor = LocalBackgroundManager.current.colorHighest
val containerColorAnimatedState = animateColorAsState(containerColor)
val contentColor = contentColorFor(containerColor) val contentColor = contentColorFor(containerColor)
Surface( Surface(
modifier = Modifier.semantics { modifier = Modifier.semantics {
@ -110,7 +111,7 @@ abstract class BaseActivity : AppCompatActivity(), DIAware {
// so that it's enabled for the whole subtree // so that it's enabled for the whole subtree
testTagsAsResourceId = true testTagsAsResourceId = true
}, },
color = containerColor, color = containerColorAnimatedState.value,
contentColor = contentColor, contentColor = contentColor,
) { ) {
CompositionLocalProvider( CompositionLocalProvider(

3
desktopApp/src/jvmMain/kotlin/com/artemchep/keyguard/Main.kt
View File

@ -264,6 +264,7 @@ private fun ApplicationScope.KeyguardWindow(
) { ) {
KeyguardTheme { KeyguardTheme {
val containerColor = LocalBackgroundManager.current.colorHighest val containerColor = LocalBackgroundManager.current.colorHighest
val containerColorAnimatedState = animateColorAsState(containerColor)
val contentColor = contentColorFor(containerColor) val contentColor = contentColorFor(containerColor)
Surface( Surface(
modifier = Modifier.semantics { modifier = Modifier.semantics {
@ -272,7 +273,7 @@ private fun ApplicationScope.KeyguardWindow(
// so that it's enabled for the whole subtree // so that it's enabled for the whole subtree
// testTagsAsResourceId = true // testTagsAsResourceId = true
}, },
color = containerColor, color = containerColorAnimatedState.value,
contentColor = contentColor, contentColor = contentColor,
) { ) {
val kamelConfig by rememberInstance<KamelConfig>() val kamelConfig by rememberInstance<KamelConfig>()