diff --git a/lib/common/widgets/page/scrollable.dart b/lib/common/widgets/page/scrollable.dart index 86fd1fc80..92312a0c8 100644 --- a/lib/common/widgets/page/scrollable.dart +++ b/lib/common/widgets/page/scrollable.dart @@ -664,10 +664,6 @@ class CustomScrollableState extends State vsync: this, reverseDuration: const Duration(milliseconds: 500), ); - _anim = Tween( - begin: Offset.zero, - end: const Offset(0, 1), - ).animate(_animController); } @protected @@ -786,7 +782,6 @@ class CustomScrollableState extends State bool? _isSliding; late AnimationController _animController; - late Animation _anim; @override @protected @@ -1185,8 +1180,15 @@ class CustomScrollableState extends State return LayoutBuilder( builder: (context, constraints) { _maxWidth = constraints.maxWidth; - return SlideTransition( - position: _anim, + return AnimatedBuilder( + animation: _animController, + builder: (context, child) { + return Align( + alignment: AlignmentDirectional.topStart, + heightFactor: 1 - _animController.value, + child: child, + ); + }, child: Material( color: widget.bgColor, child: widget.header != null diff --git a/lib/pages/common/slide/common_slide_page.dart b/lib/pages/common/slide/common_slide_page.dart index 17cdd7cde..3dd5e159d 100644 --- a/lib/pages/common/slide/common_slide_page.dart +++ b/lib/pages/common/slide/common_slide_page.dart @@ -18,7 +18,6 @@ mixin CommonSlideMixin on State, TickerProvider { late bool _isRTL = false; late final bool enableSlide; AnimationController? _animController; - Animation? _anim; static bool slideDismissReplyPage = Pref.slideDismissReplyPage; @@ -31,10 +30,6 @@ mixin CommonSlideMixin on State, TickerProvider { vsync: this, reverseDuration: const Duration(milliseconds: 500), ); - _anim = Tween( - begin: Offset.zero, - end: const Offset(0, 1), - ).animate(_animController!); } } @@ -51,8 +46,15 @@ mixin CommonSlideMixin on State, TickerProvider { ? LayoutBuilder( builder: (context, constraints) { maxWidth = constraints.maxWidth; - return SlideTransition( - position: _anim!, + return AnimatedBuilder( + animation: _animController!, + builder: (context, child) { + return Align( + alignment: AlignmentDirectional.topStart, + heightFactor: 1 - _animController!.value, + child: child, + ); + }, child: buildPage(theme), ); }, diff --git a/pubspec.lock b/pubspec.lock index 8e4f9292b..e26d269ae 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1097,7 +1097,7 @@ packages: description: path: media_kit ref: "version_1.2.5" - resolved-ref: "43aee19d9b2b0e33e0c9dd922b36ca6ace56de29" + resolved-ref: "184bc8de91e90528e407d52b18328c9abc6ad720" url: "https://github.com/bggRGjQaUbCoE/media-kit.git" source: git version: "1.1.11" @@ -1106,7 +1106,7 @@ packages: description: path: "libs/android/media_kit_libs_android_video" ref: "version_1.2.5" - resolved-ref: "43aee19d9b2b0e33e0c9dd922b36ca6ace56de29" + resolved-ref: "184bc8de91e90528e407d52b18328c9abc6ad720" url: "https://github.com/bggRGjQaUbCoE/media-kit.git" source: git version: "1.3.7" @@ -1139,7 +1139,7 @@ packages: description: path: "libs/universal/media_kit_libs_video" ref: "version_1.2.5" - resolved-ref: "43aee19d9b2b0e33e0c9dd922b36ca6ace56de29" + resolved-ref: "184bc8de91e90528e407d52b18328c9abc6ad720" url: "https://github.com/bggRGjQaUbCoE/media-kit.git" source: git version: "1.0.5" @@ -1148,7 +1148,7 @@ packages: description: path: "libs/windows/media_kit_libs_windows_video" ref: "version_1.2.5" - resolved-ref: "43aee19d9b2b0e33e0c9dd922b36ca6ace56de29" + resolved-ref: "184bc8de91e90528e407d52b18328c9abc6ad720" url: "https://github.com/bggRGjQaUbCoE/media-kit.git" source: git version: "1.0.10" @@ -1157,7 +1157,7 @@ packages: description: path: media_kit_native_event_loop ref: "version_1.2.5" - resolved-ref: "43aee19d9b2b0e33e0c9dd922b36ca6ace56de29" + resolved-ref: "184bc8de91e90528e407d52b18328c9abc6ad720" url: "https://github.com/bggRGjQaUbCoE/media-kit.git" source: git version: "1.0.9" @@ -1166,7 +1166,7 @@ packages: description: path: media_kit_video ref: "version_1.2.5" - resolved-ref: "43aee19d9b2b0e33e0c9dd922b36ca6ace56de29" + resolved-ref: "184bc8de91e90528e407d52b18328c9abc6ad720" url: "https://github.com/bggRGjQaUbCoE/media-kit.git" source: git version: "1.2.5" @@ -1510,10 +1510,10 @@ packages: dependency: transitive description: name: sentry - sha256: d9f3dcf1ecdd600cf9ce134f622383adde5423ecfdaf0ca9b20fbc1c44849337 + sha256: "0a3a1e6b3b3873070d4dbefc6968f0d31e698ed55b4eb8ee185b230f35733b59" url: "https://pub.dev" source: hosted - version: "9.6.0" + version: "9.7.0" share_plus: dependency: "direct main" description: