diff --git a/components/controls/CollapsibleSection.qml b/components/controls/CollapsibleSection.qml index 75a6b9aa..52aa73c4 100644 --- a/components/controls/CollapsibleSection.qml +++ b/components/controls/CollapsibleSection.qml @@ -55,8 +55,7 @@ ColumnLayout { Behavior on rotation { Anim { - duration: Tokens.anim.durations.small - easing: Tokens.anim.standard + type: Anim.StandardSmall } } } @@ -83,9 +82,7 @@ ColumnLayout { clip: true Behavior on Layout.preferredHeight { - Anim { - easing: Tokens.anim.standard - } + Anim {} } StyledRect { @@ -98,9 +95,7 @@ ColumnLayout { visible: root.showBackground Behavior on opacity { - Anim { - easing: Tokens.anim.standard - } + Anim {} } } @@ -117,9 +112,7 @@ ColumnLayout { opacity: root.expanded ? 1.0 : 0.0 Behavior on opacity { - Anim { - easing: Tokens.anim.standard - } + Anim {} } StyledText { diff --git a/components/controls/FilledSlider.qml b/components/controls/FilledSlider.qml index e8593b96..794f707a 100644 --- a/components/controls/FilledSlider.qml +++ b/components/controls/FilledSlider.qml @@ -140,7 +140,7 @@ Slider { Behavior on value { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } } diff --git a/components/controls/Menu.qml b/components/controls/Menu.qml index 3f4878e6..8dcf0ad6 100644 --- a/components/controls/Menu.qml +++ b/components/controls/Menu.qml @@ -108,8 +108,7 @@ Elevation { Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } diff --git a/components/controls/SplitButton.qml b/components/controls/SplitButton.qml index ba75a678..d3e36e92 100644 --- a/components/controls/SplitButton.qml +++ b/components/controls/SplitButton.qml @@ -86,7 +86,7 @@ Row { Behavior on Layout.preferredWidth { Anim { - easing: Tokens.anim.emphasized + type: Anim.Emphasized } } } diff --git a/components/controls/StyledTextField.qml b/components/controls/StyledTextField.qml index 7eec78b8..0d193e11 100644 --- a/components/controls/StyledTextField.qml +++ b/components/controls/StyledTextField.qml @@ -61,7 +61,7 @@ TextField { Behavior on opacity { Anim { - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } } diff --git a/components/controls/ToggleButton.qml b/components/controls/ToggleButton.qml index 0ece6d4e..39abe445 100644 --- a/components/controls/ToggleButton.qml +++ b/components/controls/ToggleButton.qml @@ -87,15 +87,13 @@ StyledRect { Behavior on radius { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } Behavior on Layout.preferredWidth { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } diff --git a/components/controls/Tooltip.qml b/components/controls/Tooltip.qml index d00c144b..00252be3 100644 --- a/components/controls/Tooltip.qml +++ b/components/controls/Tooltip.qml @@ -100,8 +100,7 @@ Popup { property: "opacity" from: 0 to: 1 - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } @@ -110,8 +109,7 @@ Popup { property: "opacity" from: 1 to: 0 - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } diff --git a/components/filedialog/FolderContents.qml b/components/filedialog/FolderContents.qml index b5f34a48..c5e19cd2 100644 --- a/components/filedialog/FolderContents.qml +++ b/components/filedialog/FolderContents.qml @@ -120,8 +120,7 @@ Item { properties: "opacity,scale" from: 0 to: 1 - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } @@ -144,8 +143,7 @@ Item { } Anim { properties: "x,y" - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } diff --git a/components/widgets/ExtraIndicator.qml b/components/widgets/ExtraIndicator.qml index 1fa34837..9c7a1ced 100644 --- a/components/widgets/ExtraIndicator.qml +++ b/components/widgets/ExtraIndicator.qml @@ -44,8 +44,7 @@ StyledRect { Behavior on scale { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } } diff --git a/modules/areapicker/Picker.qml b/modules/areapicker/Picker.qml index 30c47afd..bb71e5fb 100644 --- a/modules/areapicker/Picker.qml +++ b/modules/areapicker/Picker.qml @@ -167,7 +167,7 @@ MouseArea { target: root property: "opacity" to: 0 - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } ExAnim { target: root @@ -278,7 +278,7 @@ MouseArea { Behavior on opacity { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } @@ -307,7 +307,6 @@ MouseArea { } component ExAnim: Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/background/DesktopClock.qml b/modules/background/DesktopClock.qml index be6dff61..c7415be8 100644 --- a/modules/background/DesktopClock.qml +++ b/modules/background/DesktopClock.qml @@ -158,14 +158,13 @@ Item { Behavior on clockScale { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } Behavior on implicitWidth { Anim { - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } } diff --git a/modules/bar/BarWrapper.qml b/modules/bar/BarWrapper.qml index 7c8c5973..4fde197a 100644 --- a/modules/bar/BarWrapper.qml +++ b/modules/bar/BarWrapper.qml @@ -57,8 +57,7 @@ Item { Anim { target: root property: "implicitWidth" - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } }, Transition { @@ -68,7 +67,7 @@ Item { Anim { target: root property: "implicitWidth" - easing: Tokens.anim.emphasized + type: Anim.Emphasized } } ] diff --git a/modules/bar/components/ActiveWindow.qml b/modules/bar/components/ActiveWindow.qml index b4bd3bba..f39aa4c3 100644 --- a/modules/bar/components/ActiveWindow.qml +++ b/modules/bar/components/ActiveWindow.qml @@ -101,8 +101,7 @@ Item { Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml index 80d5d009..85a920c1 100644 --- a/modules/bar/components/Tray.qml +++ b/modules/bar/components/Tray.qml @@ -116,8 +116,7 @@ StyledRect { Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml index 19d6c783..ebc0caf2 100644 --- a/modules/bar/components/workspaces/ActiveIndicator.qml +++ b/modules/bar/components/workspaces/ActiveIndicator.qml @@ -95,6 +95,6 @@ StyledRect { } component EAnim: Anim { - easing: Tokens.anim.emphasized + type: Anim.Emphasized } } diff --git a/modules/bar/components/workspaces/SpecialWorkspaces.qml b/modules/bar/components/workspaces/SpecialWorkspaces.qml index f45191f6..3ed382e9 100644 --- a/modules/bar/components/workspaces/SpecialWorkspaces.qml +++ b/modules/bar/components/workspaces/SpecialWorkspaces.qml @@ -127,12 +127,12 @@ Item { Anim { property: "scale" to: 0.5 - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } Anim { property: "opacity" to: 0 - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } @@ -192,13 +192,13 @@ Item { Behavior on y { Anim { - easing: Tokens.anim.emphasized + type: Anim.Emphasized } } Behavior on implicitHeight { Anim { - easing: Tokens.anim.emphasized + type: Anim.Emphasized } } } diff --git a/modules/bar/components/workspaces/Workspaces.qml b/modules/bar/components/workspaces/Workspaces.qml index 698312b2..2030bf80 100644 --- a/modules/bar/components/workspaces/Workspaces.qml +++ b/modules/bar/components/workspaces/Workspaces.qml @@ -140,7 +140,7 @@ StyledClippingRect { Behavior on blur { Anim { - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } } diff --git a/modules/bar/popouts/ClipWrapper.qml b/modules/bar/popouts/ClipWrapper.qml index 30fd4aaa..04a437f6 100644 --- a/modules/bar/popouts/ClipWrapper.qml +++ b/modules/bar/popouts/ClipWrapper.qml @@ -35,8 +35,7 @@ Item { Behavior on offsetScale { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/bar/popouts/Content.qml b/modules/bar/popouts/Content.qml index f1c2456b..42c5a766 100644 --- a/modules/bar/popouts/Content.qml +++ b/modules/bar/popouts/Content.qml @@ -194,7 +194,7 @@ Item { SequentialAnimation { Anim { properties: "opacity,scale" - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } PropertyAction { target: popout diff --git a/modules/bar/popouts/WirelessPassword.qml b/modules/bar/popouts/WirelessPassword.qml index 0c3bae70..909d79f2 100644 --- a/modules/bar/popouts/WirelessPassword.qml +++ b/modules/bar/popouts/WirelessPassword.qml @@ -454,8 +454,7 @@ ColumnLayout { Behavior on scale { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } } diff --git a/modules/controlcenter/NavRail.qml b/modules/controlcenter/NavRail.qml index 4522573b..420300d4 100644 --- a/modules/controlcenter/NavRail.qml +++ b/modules/controlcenter/NavRail.qml @@ -96,22 +96,20 @@ Item { Behavior on opacity { Anim { - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } } Behavior on implicitWidth { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } @@ -156,13 +154,12 @@ Item { transitions: Transition { Anim { property: "opacity" - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } Anim { properties: "implicitWidth,implicitHeight" - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/controlcenter/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml index ec47e5f1..09cc74c9 100644 --- a/modules/controlcenter/bluetooth/Details.qml +++ b/modules/controlcenter/bluetooth/Details.qml @@ -264,8 +264,7 @@ StyledFlickable { Behavior on scale { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } } @@ -498,12 +497,11 @@ StyledFlickable { ParallelAnimation { Anim { property: "implicitWidth" - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } Anim { property: "opacity" - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } } @@ -518,12 +516,11 @@ StyledFlickable { ParallelAnimation { Anim { property: "implicitWidth" - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } Anim { property: "opacity" - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } } @@ -566,7 +563,7 @@ StyledFlickable { Behavior on Layout.preferredWidth { Anim { - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } } @@ -611,8 +608,7 @@ StyledFlickable { transitions: Transition { Anim { properties: "implicitWidth,implicitHeight" - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } Anim { properties: "radius,font.pointSize" diff --git a/modules/controlcenter/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml index d5c9a28a..c3f15672 100644 --- a/modules/controlcenter/bluetooth/Settings.qml +++ b/modules/controlcenter/bluetooth/Settings.qml @@ -170,8 +170,7 @@ ColumnLayout { Behavior on scale { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } } @@ -250,15 +249,13 @@ ColumnLayout { Behavior on scale { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } @@ -404,8 +401,7 @@ ColumnLayout { Behavior on scale { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } } diff --git a/modules/controlcenter/components/ConnectedButtonGroup.qml b/modules/controlcenter/components/ConnectedButtonGroup.qml index 90f9614a..f782838d 100644 --- a/modules/controlcenter/components/ConnectedButtonGroup.qml +++ b/modules/controlcenter/components/ConnectedButtonGroup.qml @@ -98,15 +98,13 @@ StyledRect { Behavior on Layout.preferredWidth { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } Behavior on radius { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } } diff --git a/modules/controlcenter/launcher/LauncherPane.qml b/modules/controlcenter/launcher/LauncherPane.qml index 70649bce..75467873 100644 --- a/modules/controlcenter/launcher/LauncherPane.qml +++ b/modules/controlcenter/launcher/LauncherPane.qml @@ -269,13 +269,13 @@ Item { Behavior on width { Anim { - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } Behavior on opacity { Anim { - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } } diff --git a/modules/controlcenter/network/VpnDetails.qml b/modules/controlcenter/network/VpnDetails.qml index c146554f..7ac2dc50 100644 --- a/modules/controlcenter/network/VpnDetails.qml +++ b/modules/controlcenter/network/VpnDetails.qml @@ -274,15 +274,13 @@ DeviceDetails { property: "opacity" from: 0 to: 1 - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } Anim { property: "scale" from: 0.7 to: 1 - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } @@ -291,15 +289,13 @@ DeviceDetails { property: "opacity" from: 1 to: 0 - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } Anim { property: "scale" from: 1 to: 0.7 - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } diff --git a/modules/controlcenter/network/VpnList.qml b/modules/controlcenter/network/VpnList.qml index 23fdf5b1..1022117b 100644 --- a/modules/controlcenter/network/VpnList.qml +++ b/modules/controlcenter/network/VpnList.qml @@ -378,15 +378,13 @@ ColumnLayout { property: "opacity" from: 0 to: 1 - duration: Tokens.anim.durations.normal - easing: Tokens.anim.emphasized + type: Anim.Emphasized } Anim { property: "scale" from: 0.7 to: 1 - duration: Tokens.anim.durations.normal - easing: Tokens.anim.emphasized + type: Anim.Emphasized } } } @@ -397,15 +395,13 @@ ColumnLayout { property: "opacity" from: 1 to: 0 - duration: Tokens.anim.durations.small - easing: Tokens.anim.emphasized + type: Anim.EmphasizedSmall } Anim { property: "scale" from: 1 to: 0.7 - duration: Tokens.anim.durations.small - easing: Tokens.anim.emphasized + type: Anim.EmphasizedSmall } } } @@ -431,8 +427,7 @@ ColumnLayout { Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.normal - easing: Tokens.anim.emphasized + type: Anim.Emphasized } } } @@ -442,8 +437,7 @@ ColumnLayout { Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.normal - easing: Tokens.anim.emphasized + type: Anim.Emphasized } } @@ -457,8 +451,7 @@ ColumnLayout { Behavior on opacity { Anim { - duration: Tokens.anim.durations.small - easing: Tokens.anim.emphasized + type: Anim.EmphasizedSmall } } @@ -577,8 +570,7 @@ ColumnLayout { Behavior on opacity { Anim { - duration: Tokens.anim.durations.small - easing: Tokens.anim.emphasized + type: Anim.EmphasizedSmall } } @@ -815,8 +807,7 @@ ColumnLayout { target: selectionContent property: "opacity" to: 0 - duration: Tokens.anim.durations.small - easing: Tokens.anim.emphasized + type: Anim.EmphasizedSmall } } @@ -831,8 +822,7 @@ ColumnLayout { target: formContent property: "opacity" to: 1 - duration: Tokens.anim.durations.small - easing: Tokens.anim.emphasized + type: Anim.EmphasizedSmall } } } diff --git a/modules/controlcenter/network/WirelessPasswordDialog.qml b/modules/controlcenter/network/WirelessPasswordDialog.qml index f5b3afa9..5ff48f77 100644 --- a/modules/controlcenter/network/WirelessPasswordDialog.qml +++ b/modules/controlcenter/network/WirelessPasswordDialog.qml @@ -378,8 +378,7 @@ Item { Behavior on scale { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } } diff --git a/modules/dashboard/Content.qml b/modules/dashboard/Content.qml index 771d4bb4..95d2a08a 100644 --- a/modules/dashboard/Content.qml +++ b/modules/dashboard/Content.qml @@ -199,15 +199,13 @@ Item { Behavior on implicitWidth { Anim { - duration: Tokens.anim.durations.large - easing: Tokens.anim.emphasized + type: Anim.EmphasizedLarge } } Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.large - easing: Tokens.anim.emphasized + type: Anim.EmphasizedLarge } } } diff --git a/modules/dashboard/LyricsView.qml b/modules/dashboard/LyricsView.qml index 6ccbd26e..c0188304 100644 --- a/modules/dashboard/LyricsView.qml +++ b/modules/dashboard/LyricsView.qml @@ -96,7 +96,7 @@ StyledListView { } Behavior on scale { Anim { - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } } diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml index 277d12cc..22ed204b 100644 --- a/modules/dashboard/Media.qml +++ b/modules/dashboard/Media.qml @@ -61,7 +61,7 @@ Item { Behavior on playerProgress { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } @@ -505,8 +505,7 @@ Item { Behavior on Layout.preferredWidth { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } } diff --git a/modules/dashboard/Performance.qml b/modules/dashboard/Performance.qml index cfcc78f7..c93499ca 100644 --- a/modules/dashboard/Performance.qml +++ b/modules/dashboard/Performance.qml @@ -271,7 +271,7 @@ Item { Behavior on animatedPercentage { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } } @@ -323,7 +323,7 @@ Item { Behavior on animatedValue { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } } @@ -438,13 +438,13 @@ Item { Behavior on animatedUsage { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } Behavior on animatedTemp { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } } @@ -512,7 +512,7 @@ Item { Behavior on animatedPercentage { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } } @@ -639,7 +639,7 @@ Item { Behavior on animatedPercentage { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } } @@ -710,7 +710,7 @@ Item { Behavior on smoothMax { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } } diff --git a/modules/dashboard/Tabs.qml b/modules/dashboard/Tabs.qml index fc5d7ec1..32e8c469 100644 --- a/modules/dashboard/Tabs.qml +++ b/modules/dashboard/Tabs.qml @@ -170,8 +170,6 @@ Item { target: ripple property: "opacity" to: 0 - duration: Tokens.anim.durations.normal - easing: Tokens.anim.standard } } diff --git a/modules/dashboard/Wrapper.qml b/modules/dashboard/Wrapper.qml index dd097e7b..f7f03742 100644 --- a/modules/dashboard/Wrapper.qml +++ b/modules/dashboard/Wrapper.qml @@ -40,8 +40,7 @@ Item { Behavior on offsetScale { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/dashboard/dash/Calendar.qml b/modules/dashboard/dash/Calendar.qml index 990e380d..1c6bcada 100644 --- a/modules/dashboard/dash/Calendar.qml +++ b/modules/dashboard/dash/Calendar.qml @@ -236,15 +236,13 @@ CustomMouseArea { Behavior on x { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } Behavior on y { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } diff --git a/modules/dashboard/dash/Media.qml b/modules/dashboard/dash/Media.qml index c83efde5..46e56b24 100644 --- a/modules/dashboard/dash/Media.qml +++ b/modules/dashboard/dash/Media.qml @@ -20,7 +20,7 @@ Item { Behavior on playerProgress { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } diff --git a/modules/dashboard/dash/Resources.qml b/modules/dashboard/dash/Resources.qml index df560369..2e0f085b 100644 --- a/modules/dashboard/dash/Resources.qml +++ b/modules/dashboard/dash/Resources.qml @@ -80,7 +80,7 @@ Row { Behavior on value { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } } diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml index 791297ff..d862e411 100644 --- a/modules/dashboard/dash/User.qml +++ b/modules/dashboard/dash/User.qml @@ -90,8 +90,7 @@ Row { Behavior on scale { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } diff --git a/modules/drawers/ContentWindow.qml b/modules/drawers/ContentWindow.qml index b89907f7..eb44ebba 100644 --- a/modules/drawers/ContentWindow.qml +++ b/modules/drawers/ContentWindow.qml @@ -73,22 +73,19 @@ StyledWindow { Behavior on borderThickness { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } Behavior on borderRounding { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } Behavior on shadowOpacity { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } @@ -219,8 +216,7 @@ StyledWindow { Behavior on extraWidth { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } diff --git a/modules/launcher/AppList.qml b/modules/launcher/AppList.qml index ac5bea65..a2109c04 100644 --- a/modules/launcher/AppList.qml +++ b/modules/launcher/AppList.qml @@ -42,8 +42,7 @@ StyledListView { Behavior on y { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } @@ -197,7 +196,7 @@ StyledListView { addDisplaced: Transition { Anim { property: "y" - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } Anim { properties: "opacity,scale" diff --git a/modules/launcher/Content.qml b/modules/launcher/Content.qml index 48a3d4fa..69be0c3a 100644 --- a/modules/launcher/Content.qml +++ b/modules/launcher/Content.qml @@ -176,13 +176,13 @@ Item { Behavior on width { Anim { - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } Behavior on opacity { Anim { - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } } diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml index 482d6c0d..db7abdf9 100644 --- a/modules/launcher/ContentList.qml +++ b/modules/launcher/ContentList.qml @@ -60,7 +60,7 @@ Item { property: "opacity" from: 1 to: 0 - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } PropertyAction {} Anim { @@ -68,7 +68,7 @@ Item { property: "opacity" from: 0 to: 1 - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } } diff --git a/modules/launcher/Wrapper.qml b/modules/launcher/Wrapper.qml index e6cc8114..d5630b23 100644 --- a/modules/launcher/Wrapper.qml +++ b/modules/launcher/Wrapper.qml @@ -41,8 +41,7 @@ Item { Behavior on offsetScale { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/launcher/items/CalcItem.qml b/modules/launcher/items/CalcItem.qml index 534b6c10..44779544 100644 --- a/modules/launcher/items/CalcItem.qml +++ b/modules/launcher/items/CalcItem.qml @@ -120,7 +120,7 @@ Item { Behavior on implicitWidth { Anim { - easing: Tokens.anim.emphasized + type: Anim.Emphasized } } } diff --git a/modules/lock/Center.qml b/modules/lock/Center.qml index 349f44d2..9d6fd2c5 100644 --- a/modules/lock/Center.qml +++ b/modules/lock/Center.qml @@ -397,13 +397,13 @@ ColumnLayout { target: message property: "scale" to: 0.7 - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } Anim { target: message property: "opacity" to: 0 - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } } diff --git a/modules/lock/InputField.qml b/modules/lock/InputField.qml index c1c1e31f..1b6c34a7 100644 --- a/modules/lock/InputField.qml +++ b/modules/lock/InputField.qml @@ -134,8 +134,7 @@ Item { Behavior on scale { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } } diff --git a/modules/lock/LockSurface.qml b/modules/lock/LockSurface.qml index f08b528d..322773fd 100644 --- a/modules/lock/LockSurface.qml +++ b/modules/lock/LockSurface.qml @@ -36,8 +36,7 @@ WlSessionLockSurface { target: lockContent properties: "implicitWidth,implicitHeight" to: lockContent.size - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } Anim { target: lockBg @@ -48,26 +47,25 @@ WlSessionLockSurface { target: content property: "scale" to: 0 - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } Anim { target: content property: "opacity" to: 0 - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } Anim { target: lockIcon property: "opacity" to: 1 - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } Anim { target: background property: "opacity" to: 0 - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } SequentialAnimation { PauseAnimation { @@ -96,7 +94,7 @@ WlSessionLockSurface { target: background property: "opacity" to: 1 - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } SequentialAnimation { ParallelAnimation { @@ -104,8 +102,7 @@ WlSessionLockSurface { target: lockContent property: "scale" to: 1 - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } Anim { target: lockContent @@ -136,8 +133,7 @@ WlSessionLockSurface { target: content property: "scale" to: 1 - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } Anim { target: lockBg @@ -148,15 +144,13 @@ WlSessionLockSurface { target: lockContent property: "implicitWidth" to: (root.screen?.height ?? 0) * lockContent.Tokens.sizes.lock.heightMult * lockContent.Tokens.sizes.lock.ratio - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } Anim { target: lockContent property: "implicitHeight" to: (root.screen?.height ?? 0) * lockContent.Tokens.sizes.lock.heightMult - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } diff --git a/modules/lock/Media.qml b/modules/lock/Media.qml index 169d06f4..5882c322 100644 --- a/modules/lock/Media.qml +++ b/modules/lock/Media.qml @@ -34,7 +34,7 @@ Item { Behavior on opacity { Anim { - duration: Tokens.anim.durations.extraLarge + type: Anim.StandardExtraLarge } } } @@ -193,15 +193,13 @@ Item { Behavior on Layout.preferredWidth { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } Behavior on radius { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } } diff --git a/modules/lock/NotifDock.qml b/modules/lock/NotifDock.qml index 070d4a33..bf827579 100644 --- a/modules/lock/NotifDock.qml +++ b/modules/lock/NotifDock.qml @@ -73,7 +73,7 @@ ColumnLayout { Behavior on opacity { Anim { - duration: Tokens.anim.durations.extraLarge + type: Anim.StandardExtraLarge } } } @@ -103,8 +103,7 @@ ColumnLayout { property: "scale" from: 0 to: 1 - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } @@ -126,8 +125,7 @@ ColumnLayout { } Anim { property: "y" - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } @@ -138,8 +136,7 @@ ColumnLayout { } Anim { property: "y" - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } diff --git a/modules/lock/NotifGroup.qml b/modules/lock/NotifGroup.qml index 14afc8bd..b07b5193 100644 --- a/modules/lock/NotifGroup.qml +++ b/modules/lock/NotifGroup.qml @@ -298,8 +298,7 @@ StyledRect { Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/lock/Resources.qml b/modules/lock/Resources.qml index 5babda20..1f38aa00 100644 --- a/modules/lock/Resources.qml +++ b/modules/lock/Resources.qml @@ -86,7 +86,7 @@ GridLayout { Behavior on value { Anim { - duration: Tokens.anim.durations.large + type: Anim.StandardLarge } } } diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml index 73c7c287..2598ccf6 100644 --- a/modules/notifications/Notification.qml +++ b/modules/notifications/Notification.qml @@ -101,8 +101,7 @@ StyledRect { Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/osd/Content.qml b/modules/osd/Content.qml index 7ea58ab7..3ad3ef88 100644 --- a/modules/osd/Content.qml +++ b/modules/osd/Content.qml @@ -117,7 +117,7 @@ Item { Behavior on Layout.preferredHeight { Anim { - easing: Tokens.anim.emphasized + type: Anim.Emphasized } } diff --git a/modules/osd/Wrapper.qml b/modules/osd/Wrapper.qml index 2dac5222..3ea0e1a3 100644 --- a/modules/osd/Wrapper.qml +++ b/modules/osd/Wrapper.qml @@ -46,8 +46,7 @@ Item { Behavior on offsetScale { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/session/Wrapper.qml b/modules/session/Wrapper.qml index 081752d3..41d9ba1a 100644 --- a/modules/session/Wrapper.qml +++ b/modules/session/Wrapper.qml @@ -23,8 +23,7 @@ Item { Behavior on offsetScale { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/sidebar/Notif.qml b/modules/sidebar/Notif.qml index 54dfb5ff..2a390926 100644 --- a/modules/sidebar/Notif.qml +++ b/modules/sidebar/Notif.qml @@ -124,8 +124,7 @@ StyledRect { Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/sidebar/NotifActionList.qml b/modules/sidebar/NotifActionList.qml index 843d6ef9..c1bd9d7d 100644 --- a/modules/sidebar/NotifActionList.qml +++ b/modules/sidebar/NotifActionList.qml @@ -183,15 +183,13 @@ Item { Behavior on Layout.preferredWidth { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } Behavior on radius { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } } diff --git a/modules/sidebar/NotifDock.qml b/modules/sidebar/NotifDock.qml index 914164e6..bf978ec0 100644 --- a/modules/sidebar/NotifDock.qml +++ b/modules/sidebar/NotifDock.qml @@ -119,7 +119,7 @@ Item { Behavior on opacity { Anim { - duration: Tokens.anim.durations.extraLarge + type: Anim.StandardExtraLarge } } } @@ -202,8 +202,7 @@ Item { Behavior on scale { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } diff --git a/modules/sidebar/NotifDockList.qml b/modules/sidebar/NotifDockList.qml index 991802bb..2677698b 100644 --- a/modules/sidebar/NotifDockList.qml +++ b/modules/sidebar/NotifDockList.qml @@ -129,8 +129,7 @@ LazyListView { enabled: notif.LazyListView.ready Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } @@ -140,15 +139,13 @@ LazyListView { Behavior on scale { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } Behavior on x { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } @@ -159,7 +156,6 @@ LazyListView { target: root.container property: "contentY" - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/sidebar/NotifGroup.qml b/modules/sidebar/NotifGroup.qml index 8c9429bb..2f2d15f1 100644 --- a/modules/sidebar/NotifGroup.qml +++ b/modules/sidebar/NotifGroup.qml @@ -236,15 +236,13 @@ StyledRect { Behavior on rotation { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } Behavior on Layout.topMargin { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } diff --git a/modules/sidebar/NotifGroupList.qml b/modules/sidebar/NotifGroupList.qml index 7b046391..75e79040 100644 --- a/modules/sidebar/NotifGroupList.qml +++ b/modules/sidebar/NotifGroupList.qml @@ -132,8 +132,7 @@ LazyListView { enabled: notif.LazyListView.ready Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } @@ -147,8 +146,7 @@ LazyListView { Behavior on x { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } diff --git a/modules/sidebar/Wrapper.qml b/modules/sidebar/Wrapper.qml index 0ccc62b3..108c51a2 100644 --- a/modules/sidebar/Wrapper.qml +++ b/modules/sidebar/Wrapper.qml @@ -20,8 +20,7 @@ Item { Behavior on offsetScale { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/utilities/RecordingDeleteModal.qml b/modules/utilities/RecordingDeleteModal.qml index 8eda4607..13125f2c 100644 --- a/modules/utilities/RecordingDeleteModal.qml +++ b/modules/utilities/RecordingDeleteModal.qml @@ -203,8 +203,7 @@ Loader { Behavior on scale { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } diff --git a/modules/utilities/Wrapper.qml b/modules/utilities/Wrapper.qml index 137e817b..958d90e6 100644 --- a/modules/utilities/Wrapper.qml +++ b/modules/utilities/Wrapper.qml @@ -65,8 +65,7 @@ Item { Behavior on offsetScale { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } diff --git a/modules/utilities/cards/IdleInhibit.qml b/modules/utilities/cards/IdleInhibit.qml index 13d6f7a1..c37ef3c5 100644 --- a/modules/utilities/cards/IdleInhibit.qml +++ b/modules/utilities/cards/IdleInhibit.qml @@ -101,14 +101,13 @@ StyledRect { Behavior on anchors.bottomMargin { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } Behavior on opacity { Anim { - duration: Tokens.anim.durations.small + type: Anim.StandardSmall } } @@ -119,8 +118,7 @@ StyledRect { Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } diff --git a/modules/utilities/cards/RecordingList.qml b/modules/utilities/cards/RecordingList.qml index c239e06b..a0ec101b 100644 --- a/modules/utilities/cards/RecordingList.qml +++ b/modules/utilities/cards/RecordingList.qml @@ -233,8 +233,7 @@ ColumnLayout { Behavior on implicitHeight { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } } diff --git a/modules/utilities/cards/Toggles.qml b/modules/utilities/cards/Toggles.qml index 9cdf4291..8c294eb3 100644 --- a/modules/utilities/cards/Toggles.qml +++ b/modules/utilities/cards/Toggles.qml @@ -163,8 +163,7 @@ StyledRect { Behavior on Layout.preferredWidth { Anim { - duration: Tokens.anim.durations.expressiveFastSpatial - easing: Tokens.anim.expressiveFastSpatial + type: Anim.FastSpatial } } } diff --git a/modules/utilities/toasts/Toasts.qml b/modules/utilities/toasts/Toasts.qml index cce8b9f2..21f2934e 100644 --- a/modules/utilities/toasts/Toasts.qml +++ b/modules/utilities/toasts/Toasts.qml @@ -111,8 +111,7 @@ Item { properties: "opacity,scale" from: 0 to: 1 - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } ParallelAnimation { @@ -148,8 +147,7 @@ Item { Behavior on anchors.bottomMargin { Anim { - duration: Tokens.anim.durations.expressiveDefaultSpatial - easing: Tokens.anim.expressiveDefaultSpatial + type: Anim.DefaultSpatial } } }