lostecho/Tomato
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ui): animate toolbar colors according to timer mode

Browse Source
This commit is contained in:
Nishant Mishra
2025-12-01 20:45:48 +05:30
parent 7c841e74a7
commit 61578b8a21
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt
View File

@@ -203,7 +203,7 @@ class TimerService : Service() {
if (totalTime - time < lastSavedDuration)
lastSavedDuration =
0 // Sanity check, prevents errors if service is force closed
0 // Sanity check, prevents bugs if service is force closed
if (totalTime - time - lastSavedDuration > 60000)
saveTimeToDb()
}

28
app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt
View File

@@ -21,6 +21,7 @@ import android.content.Intent
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.Crossfade
import androidx.compose.animation.SharedTransitionLayout
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.expandHorizontally
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
@@ -89,6 +90,7 @@ import org.nsh07.pomodoro.ui.settingsScreen.SettingsScreenRoot
import org.nsh07.pomodoro.ui.statsScreen.StatsScreenRoot
import org.nsh07.pomodoro.ui.timerScreen.AlarmDialog
import org.nsh07.pomodoro.ui.timerScreen.TimerScreen
import org.nsh07.pomodoro.ui.timerScreen.viewModel.TimerMode
import org.nsh07.pomodoro.ui.timerScreen.viewModel.TimerViewModel
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
@@ -138,6 +140,20 @@ fun AppScreen(
WindowSizeClass.WIDTH_DP_MEDIUM_LOWER_BOUND
)
}
val primary by animateColorAsState(
if (uiState.timerMode == TimerMode.FOCUS) colorScheme.primary else colorScheme.tertiary
)
val onPrimary by animateColorAsState(
if (uiState.timerMode == TimerMode.FOCUS) colorScheme.onPrimary else colorScheme.onTertiary
)
val primaryContainer by animateColorAsState(
if (uiState.timerMode == TimerMode.FOCUS) colorScheme.primaryContainer else colorScheme.tertiaryContainer
)
val onPrimaryContainer by animateColorAsState(
if (uiState.timerMode == TimerMode.FOCUS) colorScheme.onPrimaryContainer else colorScheme.onTertiaryContainer
)
Box(
Modifier
.fillMaxWidth()
@@ -151,8 +167,8 @@ fun AppScreen(
expanded = true,
scrollBehavior = toolbarScrollBehavior,
colors = FloatingToolbarDefaults.vibrantFloatingToolbarColors(
toolbarContainerColor = colorScheme.primary,
toolbarContentColor = colorScheme.onPrimary
toolbarContainerColor = primary,
toolbarContentColor = onPrimary
),
modifier = Modifier
.padding(
@@ -183,10 +199,10 @@ fun AppScreen(
{ if (backStack.size > 1) backStack.removeAt(1) }
},
colors = ToggleButtonDefaults.toggleButtonColors(
containerColor = colorScheme.primary,
contentColor = colorScheme.onPrimary,
checkedContainerColor = colorScheme.primaryContainer,
checkedContentColor = colorScheme.onPrimaryContainer
containerColor = primary,
contentColor = onPrimary,
checkedContainerColor = primaryContainer,
checkedContentColor = onPrimaryContainer
),
shapes = ToggleButtonDefaults.shapes(
CircleShape,