diff --git a/components/Anim.qml b/components/Anim.qml index 8bc4468a..16f8bdb5 100644 --- a/components/Anim.qml +++ b/components/Anim.qml @@ -13,33 +13,48 @@ NumberAnimation { EmphasizedExtraLarge, FastSpatial, DefaultSpatial, - SlowSpatial + SlowSpatial, + FastEffects, + DefaultEffects, + SlowEffects } - property int type: Anim.Standard + property int type: Anim.DefaultSpatial duration: { - if (type < Anim.StandardSmall || type > Anim.SlowSpatial) + if (type < Anim.StandardSmall || type > Anim.SlowEffects) return Tokens.anim.durations.normal; - if (type == Anim.FastSpatial) + if (type === Anim.FastSpatial) return Tokens.anim.durations.expressiveFastSpatial; - if (type == Anim.DefaultSpatial) + if (type === Anim.DefaultSpatial) return Tokens.anim.durations.expressiveDefaultSpatial; - if (type == Anim.SlowSpatial) + if (type === Anim.SlowSpatial) 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 idx = type % 4; // 0-7 are the 4 standard types return Tokens.anim.durations[types[idx]]; } easing: { - if (type == Anim.FastSpatial) + if (type === Anim.FastSpatial) return Tokens.anim.expressiveFastSpatial; - if (type == Anim.DefaultSpatial) + if (type === Anim.DefaultSpatial) return Tokens.anim.expressiveDefaultSpatial; - if (type == Anim.SlowSpatial) + if (type === Anim.SlowSpatial) 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) return Tokens.anim.emphasized;