feat: add expressive effects anims to Anim type
Also change default anim type to DefaultSpatial
This commit is contained in:
parent
a674b6836f
commit
2126d3f1f2
1 changed files with 24 additions and 9 deletions
|
|
@ -13,33 +13,48 @@ NumberAnimation {
|
||||||
EmphasizedExtraLarge,
|
EmphasizedExtraLarge,
|
||||||
FastSpatial,
|
FastSpatial,
|
||||||
DefaultSpatial,
|
DefaultSpatial,
|
||||||
SlowSpatial
|
SlowSpatial,
|
||||||
|
FastEffects,
|
||||||
|
DefaultEffects,
|
||||||
|
SlowEffects
|
||||||
}
|
}
|
||||||
|
|
||||||
property int type: Anim.Standard
|
property int type: Anim.DefaultSpatial
|
||||||
|
|
||||||
duration: {
|
duration: {
|
||||||
if (type < Anim.StandardSmall || type > Anim.SlowSpatial)
|
if (type < Anim.StandardSmall || type > Anim.SlowEffects)
|
||||||
return Tokens.anim.durations.normal;
|
return Tokens.anim.durations.normal;
|
||||||
|
|
||||||
if (type == Anim.FastSpatial)
|
if (type === Anim.FastSpatial)
|
||||||
return Tokens.anim.durations.expressiveFastSpatial;
|
return Tokens.anim.durations.expressiveFastSpatial;
|
||||||
if (type == Anim.DefaultSpatial)
|
if (type === Anim.DefaultSpatial)
|
||||||
return Tokens.anim.durations.expressiveDefaultSpatial;
|
return Tokens.anim.durations.expressiveDefaultSpatial;
|
||||||
if (type == Anim.SlowSpatial)
|
if (type === Anim.SlowSpatial)
|
||||||
return Tokens.anim.durations.expressiveSlowSpatial;
|
return Tokens.anim.durations.expressiveSlowSpatial;
|
||||||
|
if (type === Anim.FastEffects)
|
||||||
|
return Tokens.anim.durations.expressiveFastEffects;
|
||||||
|
if (type === Anim.DefaultEffects)
|
||||||
|
return Tokens.anim.durations.expressiveDefaultEffects;
|
||||||
|
if (type === Anim.SlowEffects)
|
||||||
|
return Tokens.anim.durations.expressiveSlowEffects;
|
||||||
|
|
||||||
const types = ["small", "normal", "large", "extraLarge"];
|
const types = ["small", "normal", "large", "extraLarge"];
|
||||||
const idx = type % 4; // 0-7 are the 4 standard types
|
const idx = type % 4; // 0-7 are the 4 standard types
|
||||||
return Tokens.anim.durations[types[idx]];
|
return Tokens.anim.durations[types[idx]];
|
||||||
}
|
}
|
||||||
easing: {
|
easing: {
|
||||||
if (type == Anim.FastSpatial)
|
if (type === Anim.FastSpatial)
|
||||||
return Tokens.anim.expressiveFastSpatial;
|
return Tokens.anim.expressiveFastSpatial;
|
||||||
if (type == Anim.DefaultSpatial)
|
if (type === Anim.DefaultSpatial)
|
||||||
return Tokens.anim.expressiveDefaultSpatial;
|
return Tokens.anim.expressiveDefaultSpatial;
|
||||||
if (type == Anim.SlowSpatial)
|
if (type === Anim.SlowSpatial)
|
||||||
return Tokens.anim.expressiveSlowSpatial;
|
return Tokens.anim.expressiveSlowSpatial;
|
||||||
|
if (type === Anim.FastEffects)
|
||||||
|
return Tokens.anim.expressiveFastEffects;
|
||||||
|
if (type === Anim.DefaultEffects)
|
||||||
|
return Tokens.anim.expressiveDefaultEffects;
|
||||||
|
if (type === Anim.SlowEffects)
|
||||||
|
return Tokens.anim.expressiveSlowEffects;
|
||||||
|
|
||||||
if (type >= Anim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
|
if (type >= Anim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
|
||||||
return Tokens.anim.emphasized;
|
return Tokens.anim.emphasized;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue