diff --git a/lib/common/widgets/refresh_indicator.dart b/lib/common/widgets/refresh_indicator.dart index 266ee6505..d01151a16 100644 --- a/lib/common/widgets/refresh_indicator.dart +++ b/lib/common/widgets/refresh_indicator.dart @@ -600,8 +600,7 @@ class RefreshIndicatorState extends State _status = RefreshIndicatorStatus.refresh; }); - final Future refreshResult = widget.onRefresh(); - refreshResult.whenComplete(() { + widget.onRefresh().whenComplete(() { if (mounted && _status == RefreshIndicatorStatus.refresh) { completer.complete(); _dismiss(RefreshIndicatorStatus.done); diff --git a/lib/common/widgets/scroll_physics.dart b/lib/common/widgets/scroll_physics.dart index 6962813e5..9e0ef3b1a 100644 --- a/lib/common/widgets/scroll_physics.dart +++ b/lib/common/widgets/scroll_physics.dart @@ -87,4 +87,12 @@ class CustomSpringDescription implements SpringDescription { static final _instance = CustomSpringDescription._(); factory CustomSpringDescription() => _instance; + + /// Defaults to 0. + @override + double bounce = 0.0; + + /// Defaults to 0.5 seconds. + @override + Duration duration = const Duration(milliseconds: 500); } diff --git a/lib/utils/page_utils.dart b/lib/utils/page_utils.dart index 714202da5..3326a71e3 100644 --- a/lib/utils/page_utils.dart +++ b/lib/utils/page_utils.dart @@ -297,7 +297,7 @@ class PageUtils { context: context, useSafeArea: true, isScrollControlled: true, - sheetAnimationStyle: AnimationStyle(curve: Curves.ease), + sheetAnimationStyle: const AnimationStyle(curve: Curves.ease), constraints: BoxConstraints( maxWidth: min(640, min(Get.width, Get.height)), ), @@ -531,7 +531,7 @@ class PageUtils { elevation: 0, backgroundColor: Colors.transparent, transitionAnimationController: transitionAnimationController, - sheetAnimationStyle: AnimationStyle(duration: Duration.zero), + sheetAnimationStyle: const AnimationStyle(duration: Duration.zero), ); } diff --git a/lib/utils/request_utils.dart b/lib/utils/request_utils.dart index 30727b534..3647f6785 100644 --- a/lib/utils/request_utils.dart +++ b/lib/utils/request_utils.dart @@ -157,7 +157,7 @@ class RequestUtils { context: context, useSafeArea: true, isScrollControlled: true, - sheetAnimationStyle: AnimationStyle(curve: Curves.ease), + sheetAnimationStyle: const AnimationStyle(curve: Curves.ease), constraints: BoxConstraints( maxWidth: min(640, min(Get.width, Get.height)), ), diff --git a/lib/utils/theme_utils.dart b/lib/utils/theme_utils.dart index 482127c73..40b14f461 100644 --- a/lib/utils/theme_utils.dart +++ b/lib/utils/theme_utils.dart @@ -39,7 +39,7 @@ class ThemeUtils { labelSmall: textStyle, ), tabBarTheme: - fontWeight == null ? null : TabBarTheme(labelStyle: textStyle), + fontWeight == null ? null : TabBarThemeData(labelStyle: textStyle), appBarTheme: AppBarTheme( elevation: 0, titleSpacing: 0, @@ -72,7 +72,7 @@ class ThemeUtils { popupMenuTheme: PopupMenuThemeData( surfaceTintColor: isDynamic ? colorScheme.onSurfaceVariant : null, ), - cardTheme: CardTheme( + cardTheme: CardThemeData( elevation: 1, surfaceTintColor: isDynamic ? colorScheme.onSurfaceVariant @@ -84,7 +84,7 @@ class ThemeUtils { progressIndicatorTheme: ProgressIndicatorThemeData( refreshBackgroundColor: colorScheme.onSecondary, ), - dialogTheme: DialogTheme( + dialogTheme: DialogThemeData( titleTextStyle: TextStyle( fontSize: 18, color: colorScheme.onSurface, diff --git a/pubspec.lock b/pubspec.lock index 45203fbbf..f91cbd028 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -98,10 +98,10 @@ packages: dependency: transitive description: name: async - sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.12.0" + version: "2.13.0" audio_service: dependency: "direct main" description: @@ -526,10 +526,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.3.3" ffi: dependency: transitive description: @@ -1020,10 +1020,10 @@ packages: dependency: "direct main" description: name: intl - sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" url: "https://pub.dev" source: hosted - version: "0.19.0" + version: "0.20.2" io: dependency: transitive description: @@ -1052,10 +1052,10 @@ packages: dependency: transitive description: name: leak_tracker - sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" url: "https://pub.dev" source: hosted - version: "10.0.8" + version: "10.0.9" leak_tracker_flutter_testing: dependency: transitive description: @@ -1462,10 +1462,10 @@ packages: dependency: "direct main" description: name: protobuf - sha256: fbb0c37d435641d0b84813c1dad41e6fa61ddc880a320bce16b3063ecec35aa6 + sha256: "579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.0" pub_semver: dependency: transitive description: @@ -1980,10 +1980,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 url: "https://pub.dev" source: hosted - version: "14.3.1" + version: "15.0.0" volume_controller: dependency: transitive description: @@ -2098,4 +2098,4 @@ packages: version: "3.1.3" sdks: dart: ">=3.7.0 <4.0.0" - flutter: ">=3.29.3" + flutter: ">=3.32.0" diff --git a/pubspec.yaml b/pubspec.yaml index bf247a6b7..5d643f5f4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,7 +21,7 @@ version: 1.1.3+1 environment: sdk: ">=3.0.0 <4.0.0" - flutter: 3.29.3 + flutter: 3.32.0 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -181,7 +181,7 @@ dependencies: ref: main path: packages/chat_bottom_container image_picker: ^1.1.2 - intl: ^0.19.0 + intl: ^0.20.2 archive: ^4.0.0 flutter_svg: ^2.0.14 image_cropper: ^8.0.2