@@ -121,11 +121,11 @@ fun TimerScreen(
|
|||||||
if (!timerState.showBrandTitle) timerState.timerMode else TimerMode.BRAND,
|
if (!timerState.showBrandTitle) timerState.timerMode else TimerMode.BRAND,
|
||||||
transitionSpec = {
|
transitionSpec = {
|
||||||
slideInVertically(
|
slideInVertically(
|
||||||
animationSpec = motionScheme.slowSpatialSpec(),
|
animationSpec = motionScheme.defaultSpatialSpec(),
|
||||||
initialOffsetY = { (-it * 1.25).toInt() }
|
initialOffsetY = { (-it * 1.25).toInt() }
|
||||||
).togetherWith(
|
).togetherWith(
|
||||||
slideOutVertically(
|
slideOutVertically(
|
||||||
animationSpec = motionScheme.slowSpatialSpec(),
|
animationSpec = motionScheme.defaultSpatialSpec(),
|
||||||
targetOffsetY = { (it * 1.25).toInt() }
|
targetOffsetY = { (it * 1.25).toInt() }
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -159,7 +159,7 @@ fun TimerScreen(
|
|||||||
)
|
)
|
||||||
|
|
||||||
TimerMode.SHORT_BREAK -> Text(
|
TimerMode.SHORT_BREAK -> Text(
|
||||||
"Short Break",
|
"Short break",
|
||||||
style = TextStyle(
|
style = TextStyle(
|
||||||
fontFamily = robotoFlexTopBar,
|
fontFamily = robotoFlexTopBar,
|
||||||
fontSize = 32.sp,
|
fontSize = 32.sp,
|
||||||
@@ -458,7 +458,7 @@ fun TimerScreen(
|
|||||||
Text(
|
Text(
|
||||||
when (timerState.nextTimerMode) {
|
when (timerState.nextTimerMode) {
|
||||||
TimerMode.FOCUS -> "Focus"
|
TimerMode.FOCUS -> "Focus"
|
||||||
TimerMode.SHORT_BREAK -> "Short Break"
|
TimerMode.SHORT_BREAK -> "Short break"
|
||||||
else -> "Long Break"
|
else -> "Long Break"
|
||||||
},
|
},
|
||||||
style = typography.titleMediumEmphasized
|
style = typography.titleMediumEmphasized
|
||||||
|
|||||||
Reference in New Issue
Block a user