diff --git a/lib/ui/common/collectible_item.dart b/lib/ui/common/collectible_item.dart index c509ec4e..6f1ffb57 100644 --- a/lib/ui/common/collectible_item.dart +++ b/lib/ui/common/collectible_item.dart @@ -54,9 +54,9 @@ class CollectibleItem extends StatelessWidget with GetItMixin { .animate(onPlay: (controller) => controller.repeat()) .shimmer(delay: 4000.ms, duration: $styles.times.med * 3) .shake(curve: Curves.easeInOutCubic, hz: 4) - .scale(begin: 1.0, end: 1.1, duration: $styles.times.med) + .scale(end: Offset(1.1, 1.1), duration: $styles.times.med) .then(delay: $styles.times.med) - .scale(begin: 1.0, end: 1 / 1.1), + .scale(end: Offset(1 / 1.1, 1 / 1.1)), ), ), ), diff --git a/lib/ui/screens/collectible_found/collectible_found_screen.dart b/lib/ui/screens/collectible_found/collectible_found_screen.dart index 3a968667..a9a4fe1a 100644 --- a/lib/ui/screens/collectible_found/collectible_found_screen.dart +++ b/lib/ui/screens/collectible_found/collectible_found_screen.dart @@ -44,7 +44,10 @@ class CollectibleFoundScreen extends StatelessWidget { fit: BoxFit.contain, ), ), - ).animate().scale(begin: 1.5, end: 3, curve: Curves.easeInExpo, delay: t, duration: t * 3).fadeOut(), + ) + .animate() + .scale(begin: Offset(1.5, 1.5), end: Offset(3, 3), curve: Curves.easeInExpo, delay: t, duration: t * 3) + .fadeOut(), ) ]); } @@ -140,14 +143,14 @@ class CollectibleFoundScreen extends StatelessWidget { child: child, ), ) - .scale(begin: 0.3, duration: t * 2, curve: Curves.easeOutExpo, alignment: Alignment(0, 0.7)); + .scale(begin: Offset(0.3, 0.3), duration: t * 2, curve: Curves.easeOutExpo, alignment: Alignment(0, 0.7)); } Widget _buildRibbon(BuildContext context) { Duration t = $styles.times.fast; return _AnimatedRibbon($strings.collectibleFoundTitleArtifactDiscovered.toUpperCase()) .animate() - .scale(begin: 0.3, duration: t * 2, curve: Curves.easeOutExpo, alignment: Alignment(0, -1)); + .scale(begin: Offset(0.3, 0.3), duration: t * 2, curve: Curves.easeOutExpo, alignment: Alignment(0, -1)); } Widget _buildTitle(BuildContext context, String text, TextStyle style, Color color, Duration delay) { diff --git a/lib/ui/screens/editorial/widgets/_circular_title_bar.dart b/lib/ui/screens/editorial/widgets/_circular_title_bar.dart index f4c3ac5e..f12093b7 100644 --- a/lib/ui/screens/editorial/widgets/_circular_title_bar.dart +++ b/lib/ui/screens/editorial/widgets/_circular_title_bar.dart @@ -38,7 +38,7 @@ class _CircularTitleBar extends StatelessWidget { child: Image.asset('${ImagePaths.common}/${icons[index]}') .animate(key: ValueKey(index)) .fade() - .scale(begin: .5, end: 1, curve: Curves.easeOutBack, duration: $styles.times.med), + .scale(begin: Offset(0.5, 0.5), curve: Curves.easeOutBack, duration: $styles.times.med), ), ), ], diff --git a/lib/ui/screens/home_menu/home_menu.dart b/lib/ui/screens/home_menu/home_menu.dart index 4604e584..9598296c 100644 --- a/lib/ui/screens/home_menu/home_menu.dart +++ b/lib/ui/screens/home_menu/home_menu.dart @@ -80,7 +80,7 @@ class _HomeMenuState extends State { _buildIconGrid(context) .animate() .fade(duration: $styles.times.fast) - .scale(begin: .8, curve: Curves.easeOut), + .scale(begin: Offset(.8, .8), curve: Curves.easeOut), Gap($styles.insets.lg), _buildBottomBtns(context), //Spacer(), diff --git a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig index c8b6b35b..c169698d 100644 --- a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig +++ b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig @@ -3,8 +3,8 @@ FLUTTER_ROOT=C:\_dev\sdks\flutter FLUTTER_APPLICATION_PATH=C:\_dev\gskinner\flutter_wonders_app COCOAPODS_PARALLEL_CODE_SIGN=true FLUTTER_BUILD_DIR=build -FLUTTER_BUILD_NAME=2.0.13 -FLUTTER_BUILD_NUMBER=2.0.13 +FLUTTER_BUILD_NAME=2.0.14 +FLUTTER_BUILD_NUMBER=1 DART_OBFUSCATION=false TRACK_WIDGET_CREATION=true TREE_SHAKE_ICONS=false diff --git a/macos/Flutter/ephemeral/flutter_export_environment.sh b/macos/Flutter/ephemeral/flutter_export_environment.sh index 771bd2b3..71f77e79 100755 --- a/macos/Flutter/ephemeral/flutter_export_environment.sh +++ b/macos/Flutter/ephemeral/flutter_export_environment.sh @@ -4,8 +4,8 @@ export "FLUTTER_ROOT=C:\_dev\sdks\flutter" export "FLUTTER_APPLICATION_PATH=C:\_dev\gskinner\flutter_wonders_app" export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_BUILD_DIR=build" -export "FLUTTER_BUILD_NAME=2.0.13" -export "FLUTTER_BUILD_NUMBER=2.0.13" +export "FLUTTER_BUILD_NAME=2.0.14" +export "FLUTTER_BUILD_NUMBER=1" export "DART_OBFUSCATION=false" export "TRACK_WIDGET_CREATION=true" export "TREE_SHAKE_ICONS=false" diff --git a/pubspec.lock b/pubspec.lock index e0380cf5..8ac7fbdf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -306,10 +306,10 @@ packages: dependency: "direct main" description: name: flutter_animate - sha256: "1f6fdee1f63eda3c35e04c07664593c31b7fdae290b6b0dc513d2fdfb2d27c76" + sha256: be54662837a6e66cc53ee88549e808c625275e0faf5a43e11cf3182cb0bd1b02 url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "4.2.0" flutter_circular_text: dependency: "direct main" description: @@ -396,10 +396,10 @@ packages: dependency: "direct main" description: name: gap - sha256: "6e35ee60d5bbc61b0bec97cc5ba7ed32f62f1f62449e281ea77677479418a15d" + sha256: "976fa1e405d7d8249b3d2ec0e18a1eac116f0a86430c29a7485dff6f5326f03a" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" get_it: dependency: "direct main" description: @@ -1271,4 +1271,4 @@ packages: version: "2.0.2" sdks: dart: ">=3.0.0-0 <4.0.0" - flutter: ">=3.7.0-0" + flutter: ">=3.7.0" diff --git a/pubspec.yaml b/pubspec.yaml index 08087d7e..6519eaa6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,13 +19,13 @@ dependencies: equatable: ^2.0.5 extra_alignments: ^1.0.0+1 flextras: ^1.0.0 - flutter_animate: ^1.0.0 + flutter_animate: ^4.0.0 flutter_circular_text: ^0.3.1 flutter_displaymode: ^0.5.0 flutter_native_splash: ^2.2.17 flutter_staggered_grid_view: ^0.6.2 flutter_svg: ^2.0.1 - gap: ^2.0.1 + gap: ^3.0.0 get_it: ^7.2.0 get_it_mixin: ^3.1.4 google_maps_flutter: ^2.2.3