From 0df9d2ac27fc82a8206677d9ce9bc07c5b986f96 Mon Sep 17 00:00:00 2001 From: inexcode Date: Fri, 24 Feb 2023 13:38:57 +0300 Subject: [PATCH] feat: Use Material 3 animation curves --- lib/ui/components/brand_button/segmented_buttons.dart | 4 ++-- .../brand_linear_indicator/brand_linear_indicator.dart | 4 ++-- lib/ui/layouts/root_scaffold_with_navigation.dart | 4 ++-- lib/ui/pages/onboarding/onboarding.dart | 2 +- lib/ui/router/router.dart | 8 ++++---- lib/ui/router/router.gr.dart | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/ui/components/brand_button/segmented_buttons.dart b/lib/ui/components/brand_button/segmented_buttons.dart index 7632dc20..6dcf611b 100644 --- a/lib/ui/components/brand_button/segmented_buttons.dart +++ b/lib/ui/components/brand_button/segmented_buttons.dart @@ -38,7 +38,7 @@ class SegmentedButtons extends StatelessWidget { opacity: isSelected[index] ? 1 : 0, child: AnimatedScale( duration: const Duration(milliseconds: 200), - curve: Curves.easeInOut, + curve: Curves.easeInOutCubicEmphasized, alignment: Alignment.centerLeft, scale: isSelected[index] ? 1 : 0, child: Icon( @@ -53,7 +53,7 @@ class SegmentedButtons extends StatelessWidget { ? const EdgeInsets.only(left: 24) : EdgeInsets.zero, duration: const Duration(milliseconds: 200), - curve: Curves.easeInOut, + curve: Curves.easeInOutCubicEmphasized, child: Text( title, style: Theme.of(context).textTheme.labelLarge, diff --git a/lib/ui/components/brand_linear_indicator/brand_linear_indicator.dart b/lib/ui/components/brand_linear_indicator/brand_linear_indicator.dart index 335387f5..34fb9e10 100644 --- a/lib/ui/components/brand_linear_indicator/brand_linear_indicator.dart +++ b/lib/ui/components/brand_linear_indicator/brand_linear_indicator.dart @@ -27,14 +27,14 @@ class BrandLinearIndicator extends StatelessWidget { alignment: Alignment.centerLeft, child: AnimatedSlide( duration: const Duration(milliseconds: 400), - curve: Curves.easeInOut, + curve: Curves.easeInOutCubicEmphasized, offset: Offset( -(1 - value), 0, ), child: AnimatedContainer( duration: const Duration(milliseconds: 400), - curve: Curves.easeInOut, + curve: Curves.easeInOutCubicEmphasized, width: constraints.maxWidth, decoration: BoxDecoration( color: color, diff --git a/lib/ui/layouts/root_scaffold_with_navigation.dart b/lib/ui/layouts/root_scaffold_with_navigation.dart index f8e1048b..6401a783 100644 --- a/lib/ui/layouts/root_scaffold_with_navigation.dart +++ b/lib/ui/layouts/root_scaffold_with_navigation.dart @@ -190,9 +190,9 @@ class BottomBar extends StatelessWidget { print(prevActiveIndex); return AnimatedContainer( - duration: const Duration(milliseconds: 200), + duration: const Duration(milliseconds: 500), height: hidden ? 0 : 80, - curve: Curves.easeInOut, + curve: Curves.easeInOutCubicEmphasized, clipBehavior: Clip.antiAlias, decoration: BoxDecoration( color: Theme.of(context).scaffoldBackgroundColor, diff --git a/lib/ui/pages/onboarding/onboarding.dart b/lib/ui/pages/onboarding/onboarding.dart index 34c49b93..9da66e9d 100644 --- a/lib/ui/pages/onboarding/onboarding.dart +++ b/lib/ui/pages/onboarding/onboarding.dart @@ -76,7 +76,7 @@ class _OnboardingPageState extends State { pageController.animateToPage( 1, duration: const Duration(milliseconds: 300), - curve: Curves.easeIn, + curve: Curves.easeInOutCubicEmphasized, ); }, text: 'basis.next'.tr(), diff --git a/lib/ui/router/router.dart b/lib/ui/router/router.dart index 92c588e0..d6f8043f 100644 --- a/lib/ui/router/router.dart +++ b/lib/ui/router/router.dart @@ -53,25 +53,25 @@ Widget fadeThroughTransition( usesPathAsKey: true, initial: true, transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 200, + durationInMilliseconds: 400, ), CustomRoute( page: ServicesPage, usesPathAsKey: true, transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 200, + durationInMilliseconds: 400, ), CustomRoute( page: UsersPage, usesPathAsKey: true, transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 200, + durationInMilliseconds: 400, ), CustomRoute( page: MorePage, usesPathAsKey: true, transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 200, + durationInMilliseconds: 400, ), AutoRoute(page: AppSettingsPage), AutoRoute(page: UserDetailsPage), diff --git a/lib/ui/router/router.gr.dart b/lib/ui/router/router.gr.dart index eae72e33..e2655f39 100644 --- a/lib/ui/router/router.gr.dart +++ b/lib/ui/router/router.gr.dart @@ -64,7 +64,7 @@ class _$RootRouter extends RootStackRouter { routeData: routeData, child: const ProvidersPage(), transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 200, + durationInMilliseconds: 400, opaque: true, barrierDismissible: false, ); @@ -74,7 +74,7 @@ class _$RootRouter extends RootStackRouter { routeData: routeData, child: const ServicesPage(), transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 200, + durationInMilliseconds: 400, opaque: true, barrierDismissible: false, ); @@ -84,7 +84,7 @@ class _$RootRouter extends RootStackRouter { routeData: routeData, child: const UsersPage(), transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 200, + durationInMilliseconds: 400, opaque: true, barrierDismissible: false, ); @@ -94,7 +94,7 @@ class _$RootRouter extends RootStackRouter { routeData: routeData, child: const MorePage(), transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 200, + durationInMilliseconds: 400, opaque: true, barrierDismissible: false, );