Animation Typography -> MaterialAnimation MaterialTypography (#9496)

Author: NigelBreslaw

ui-libraries/material/examples/gallery/ui/components/component_card.slint

@@ -4,7 +4,7 @@
 import {
     MaterialText,
     OutlinedCard,
-    Typography,
+    MaterialTypography,
     MaterialStyleMetrics
 } from "../../../../material.slint";
 
@@ -21,7 +21,7 @@ export component ComponentCard {
             MaterialText {
                 horizontal_alignment: center;
                 text: root.title;
-                style: Typography.title_medium;
+                style: MaterialTypography.title_medium;
             }
 
             OutlinedCard {

ui-libraries/material/examples/gallery/ui/components/group.slint

@@ -4,7 +4,7 @@
 import {
     MaterialText,
     MaterialPalette,
-    Typography
+    MaterialTypography
 } from "../../../../material.slint";
 
 export component Group {
@@ -22,7 +22,7 @@ export component Group {
             MaterialText {
                 horizontal_alignment: center;
                 text: root.title;
-                style: Typography.headline_small;
+                style: MaterialTypography.headline_small;
             }
 
             @children

ui-libraries/material/examples/gallery/ui/views/actions_view.slint

@@ -7,7 +7,7 @@ import {
     OutlinedCard,
     MaterialText,
     MaterialPalette,
-    Typography,
+    MaterialTypography,
     ElevatedButton,
     FilledButton,
     TonalButton,

ui-libraries/material/examples/gallery/ui/views/components_view.slint

@@ -8,7 +8,7 @@ import {
     OutlinedCard,
     MaterialText,
     MaterialPalette,
-    Typography,
+    MaterialTypography,
     ElevatedButton,
     FilledButton,
     TonalButton,

ui-libraries/material/examples/gallery/ui/views/main_view.slint

@@ -7,10 +7,10 @@ import { MainWindowAdapter } from "../main_window_adapter.slint";
 import { FilledIcons, OutlinedIcons } from "../icons.slint";
 import {
     MaterialText,
-    Typography,
+    MaterialTypography,
     IconButton,
     MaterialPalette,
-    Animations,
+    MaterialAnimations,
     NavigationRail,
     NavigationItem,
     NavigationBar,

ui-libraries/material/material.slint

@@ -59,8 +59,8 @@ export { NavigationItem, NavigationGroup } from "./ui/items/navigation_item.slin
 export { MenuItem } from "./ui/items/menu_item.slint";
 
 // styles
-export { Animations } from "./ui/styling/animations.slint";
+export { MaterialAnimations } from "./ui/styling/material_animations.slint";
 export { MaterialScheme, MaterialSchemes } from "./ui/styling/material_schemes.slint";
 export { MaterialStyleMetrics } from "./ui/styling/material_style_metrics.slint";
 export { MaterialPalette } from "./ui/styling/material_palette.slint";
-export { Typography } from "./ui/styling/typography.slint";
+export { MaterialTypography } from "./ui/styling/material_typography.slint";

ui-libraries/material/ui/components/app_bar.slint

@@ -3,7 +3,7 @@
 
 import { IconButton } from "./icon_button.slint";
 import { MaterialText } from "./material_text.slint";
-import { Typography, TextStyle } from "../styling/typography.slint";
+import { MaterialTypography, TextStyle } from "../styling/material_typography.slint";
 import { MaterialPalette } from "../styling/material_palette.slint";
 import { MaterialStyleMetrics } from "../styling/material_style_metrics.slint";
 import { IconButtonItem } from "./bottom_app_bar.slint";
@@ -131,7 +131,7 @@ export component AppBar {
             appbar_padding_top: MaterialStyleMetrics.padding_8;
             appbar_padding_bottom: self.padding_top;
             spacing: MaterialStyleMetrics.spacing_6;
-            text_style: Typography.title_large;
+            text_style: MaterialTypography.title_large;
 
             leading_button_clicked => {
                 root.leading_button_clicked();
@@ -166,7 +166,7 @@ export component SmallAppBar {
             appbar_padding_top: MaterialStyleMetrics.padding_8;
             appbar_padding_bottom: self.padding_top;
             spacing: MaterialStyleMetrics.spacing_4;
-            text_style: Typography.title_large;
+            text_style: MaterialTypography.title_large;
 
             leading_button_clicked => {
                 root.leading_button_clicked();
@@ -203,7 +203,7 @@ export component MediumAppBar {
             vertical_spacing: MaterialStyleMetrics.spacing_4;
             spacing: MaterialStyleMetrics.spacing_4;
             two_rows: true;
-            text_style: Typography.headline_small;
+            text_style: MaterialTypography.headline_small;
             text_padding: MaterialStyleMetrics.padding_16;
 
             leading_button_clicked => {
@@ -241,7 +241,7 @@ export component LargeAppBar {
             vertical_spacing: MaterialStyleMetrics.spacing_40;
             spacing: MaterialStyleMetrics.spacing_4;
             two_rows: true;
-            text_style: Typography.headline_medium;
+            text_style: MaterialTypography.headline_medium;
             text_padding: MaterialStyleMetrics.padding_16;
 
             leading_button_clicked => {

ui-libraries/material/ui/components/badge.slint

@@ -3,7 +3,7 @@
 
 import { MaterialStyleMetrics } from "../styling/material_style_metrics.slint";
 import { MaterialPalette } from "../styling/material_palette.slint";
-import { Typography } from "../styling/typography.slint";
+import { MaterialTypography } from "../styling/material_typography.slint";
 import { MaterialText } from "material_text.slint";
 
 export component Badge {
@@ -24,7 +24,7 @@ export component Badge {
         color: MaterialPalette.on_error;
         vertical_alignment: center;
         horizontal_alignment: center;
-        style: Typography.label_small;
+        style: MaterialTypography.label_small;
     }
 
     states [

ui-libraries/material/ui/components/base_button.slint

@@ -4,7 +4,7 @@
 import { StateLayerArea } from "./state_layer.slint";
 import { MaterialText } from "./material_text.slint";
 import { Icon } from "./icon.slint";
-import { Typography } from "../styling/typography.slint";
+import { MaterialTypography } from "../styling/material_typography.slint";
 import { MaterialStyleMetrics } from "../styling/material_style_metrics.slint";
 import { Avatar } from "./list.slint";
 
@@ -60,7 +60,7 @@ export component BaseButton inherits StateLayerArea {
 
         if root.text != "" : MaterialText {
             text: root.text;
-            style: Typography.label_large;
+            style: MaterialTypography.label_large;
             color: root.color;
             opacity: root.enabled ? 100% : 38%;
             overflow: clip;

ui-libraries/material/ui/components/bottom_sheet.slint

@@ -5,7 +5,7 @@ import { Elevation } from "./elevation.slint";
 import { MaterialPalette } from "../styling/material_palette.slint";
 import { MaterialStyleMetrics } from "../styling/material_style_metrics.slint";
 import { Horizontal } from "./horizontal.slint";
-import { Animations } from "../styling/animations.slint";
+import { MaterialAnimations } from "../styling/material_animations.slint";
 import { Modal } from "./modal.slint";
 
 component BottomSheet {
@@ -71,7 +71,7 @@ export component ModalBottomSheet inherits PopupWindow {
         height: 100%;
 
         sheet := BottomSheet {
-            property <duration> y_duration: Animations.standard_accelerate_duration;
+            property <duration> y_duration: MaterialAnimations.standard_accelerate_duration;
             property <length> y_drag_start;
             property <length> height_drag_start;
 
@@ -98,14 +98,14 @@ export component ModalBottomSheet inherits PopupWindow {
                     return;
                 }
 
-                self.y_duration = Animations.standard_accelerate_duration;
+                self.y_duration = MaterialAnimations.standard_accelerate_duration;
                 self.height = self.height_drag_start;
                 self.y = self.y_drag_start;
             }
 
             animate y, height {
                 duration: self.y_duration;
-                easing: Animations.standard_easing;
+                easing: MaterialAnimations.standard_easing;
             }
         }