Proton/android-mail
1
0
Fork 0
mirror of https://github.com/ProtonMail/android-mail.git synced 2026-05-15 09:50:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update toolbar background color

Browse Source 
ET-6040
This commit is contained in:
Niccolò Forlini
2026-04-07 15:57:14 +02:00
parent b3153de0ff
commit c0025844ac
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail-common/presentation/src/main/kotlin/ch/protonmail/android/mailcommon/presentation/ui/FloatingBottomToolbar.kt
+1 -1
View File
@@ -67,7 +67,7 @@ fun FloatingBottomToolbar(
val shownData = lastShownState.value ?: return val shownData = lastShownState.value ?: return
val surfaceColor by animateColorAsState( val surfaceColor by animateColorAsState(
targetValue = if (isVisible) ProtonTheme.colors.backgroundNorm else Color.Transparent, targetValue = if (isVisible) ProtonTheme.colors.interactionFabNorm else Color.Transparent,
animationSpec = tween(ANIMATION_DURATION), animationSpec = tween(ANIMATION_DURATION),
label = "surfaceColor" label = "surfaceColor"
) )
mail-mailbox/presentation/src/main/kotlin/ch/protonmail/android/mailmailbox/presentation/mailbox/MailboxFabToolbarMorph.kt
+1 -9
View File
@@ -18,7 +18,6 @@
package ch.protonmail.android.mailmailbox.presentation.mailbox package ch.protonmail.android.mailmailbox.presentation.mailbox
import androidx.compose.animation.animateColor
import androidx.compose.animation.core.Spring import androidx.compose.animation.core.Spring
import androidx.compose.animation.core.animateDp import androidx.compose.animation.core.animateDp
import androidx.compose.animation.core.animateDpAsState import androidx.compose.animation.core.animateDpAsState
@@ -112,13 +111,6 @@ internal fun MailboxFabToolbarMorph(
label = "horizontalBias" label = "horizontalBias"
) { inSelection -> if (inSelection) 0f else 1f } ) { inSelection -> if (inSelection) 0f else 1f }
val surfaceColor by transition.animateColor(
transitionSpec = { spring(stiffness = Spring.StiffnessMediumLow) },
label = "surfaceColor"
) { inSelection ->
if (inSelection) ProtonTheme.colors.backgroundNorm else ProtonTheme.colors.interactionFabNorm
}
Box( Box(
modifier = modifier modifier = modifier
.padding(bottom = snackbarOffset) .padding(bottom = snackbarOffset)
@@ -182,7 +174,7 @@ internal fun MailboxFabToolbarMorph(
.height(FabSize), .height(FabSize),
shape = RoundedCornerShape(percent = 50), shape = RoundedCornerShape(percent = 50),
shadowElevation = ProtonDimens.ShadowElevation.Mini, shadowElevation = ProtonDimens.ShadowElevation.Mini,
color = surfaceColor color = ProtonTheme.colors.interactionFabNorm
) { ) {
Box( Box(
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,