diff --git a/lib/screens/channel/chat/chat.dart b/lib/screens/channel/chat/chat.dart index d24f43e1..a5260fb9 100644 --- a/lib/screens/channel/chat/chat.dart +++ b/lib/screens/channel/chat/chat.dart @@ -97,6 +97,8 @@ class Chat extends StatelessWidget { child: Observer( builder: (_) => AnimatedSwitcher( duration: const Duration(milliseconds: 200), + switchInCurve: Curves.easeOutCubic, + switchOutCurve: Curves.easeInCubic, child: chatStore.autoScroll ? null : Button( diff --git a/lib/screens/channel/chat/details/chat_users_list.dart b/lib/screens/channel/chat/details/chat_users_list.dart index 780fd889..8ae6cf64 100644 --- a/lib/screens/channel/chat/details/chat_users_list.dart +++ b/lib/screens/channel/chat/details/chat_users_list.dart @@ -205,6 +205,8 @@ class _ChattersListState extends State { Observer( builder: (context) => AnimatedSwitcher( duration: const Duration(milliseconds: 200), + switchInCurve: Curves.easeOutCubic, + switchOutCurve: Curves.easeInCubic, child: chatDetailsStore.showJumpButton ? ScrollToTopButton(scrollController: _scrollController) : null, ), ), diff --git a/lib/screens/home/top/categories.dart b/lib/screens/home/top/categories.dart index ff983907..74676c79 100644 --- a/lib/screens/home/top/categories.dart +++ b/lib/screens/home/top/categories.dart @@ -72,6 +72,8 @@ class _CategoriesState extends State with AutomaticKeepAliveClientMi Observer( builder: (context) => AnimatedSwitcher( duration: const Duration(milliseconds: 200), + switchInCurve: Curves.easeOutCubic, + switchOutCurve: Curves.easeInCubic, child: _categoriesStore.showJumpButton ? ScrollToTopButton(scrollController: _categoriesStore.scrollController) : null, ), ), diff --git a/lib/screens/home/top/category_streams.dart b/lib/screens/home/top/category_streams.dart index 3cacce57..6b739572 100644 --- a/lib/screens/home/top/category_streams.dart +++ b/lib/screens/home/top/category_streams.dart @@ -141,6 +141,8 @@ class _CategoryStreamsState extends State { child: Observer( builder: (context) => AnimatedSwitcher( duration: const Duration(milliseconds: 200), + switchInCurve: Curves.easeOutCubic, + switchOutCurve: Curves.easeInCubic, child: widget.listStore.showJumpButton ? ScrollToTopButton(scrollController: widget.listStore.scrollController) : null, ), ), diff --git a/lib/screens/home/widgets/streams_list.dart b/lib/screens/home/widgets/streams_list.dart index 8382d749..f0c1786b 100644 --- a/lib/screens/home/widgets/streams_list.dart +++ b/lib/screens/home/widgets/streams_list.dart @@ -102,6 +102,8 @@ class _StreamsListState extends State with AutomaticKeepAliveClient Observer( builder: (context) => AnimatedSwitcher( duration: const Duration(milliseconds: 200), + switchInCurve: Curves.easeOutCubic, + switchOutCurve: Curves.easeInCubic, child: _listStore.showJumpButton ? ScrollToTopButton(scrollController: _listStore.scrollController) : null, ), ), diff --git a/lib/widgets/animate_scale.dart b/lib/widgets/animate_scale.dart index 956b55a2..1580e286 100644 --- a/lib/widgets/animate_scale.dart +++ b/lib/widgets/animate_scale.dart @@ -26,8 +26,8 @@ class _AnimateScaleState extends State with SingleTickerProviderSt @override Widget build(BuildContext context) { const duration = Duration(milliseconds: 200); - const downCurve = Curves.easeInCubic; - const upCurve = Curves.easeOutCubic; + const downCurve = Curves.easeOutCubic; + const upCurve = Curves.easeInCubic; return InkWell( onTap: widget.onTap, diff --git a/lib/widgets/button.dart b/lib/widgets/button.dart index 038a5978..93796789 100644 --- a/lib/widgets/button.dart +++ b/lib/widgets/button.dart @@ -79,17 +79,17 @@ class _ButtonState extends State