diff --git a/lib/ui/screens/collectible_found/collectible_found_screen.dart b/lib/ui/screens/collectible_found/collectible_found_screen.dart index 34b2b2e3..42384047 100644 --- a/lib/ui/screens/collectible_found/collectible_found_screen.dart +++ b/lib/ui/screens/collectible_found/collectible_found_screen.dart @@ -156,15 +156,16 @@ class CollectibleFoundScreen extends StatelessWidget { } Widget _buildCollectionButton(BuildContext context) { - Duration t = $styles.times.fast; + Duration t = $styles.times.med; return AppBtn.from( text: $strings.collectibleFoundButtonViewCollection, isSecondary: true, onPressed: () => _handleViewCollectionPressed(context), - ) - .animate() - .show(delay: t * 4) - .move(begin: Offset(0, $styles.insets.md), duration: t * 3, curve: Curves.easeOutCubic); + ).animate().fadeIn(delay: t).move( + begin: Offset(0, 50), + duration: t, + curve: Curves.easeOutCubic, + ); } void _handleViewCollectionPressed(BuildContext context) { diff --git a/lib/ui/screens/home_menu/about_dialog_content.dart b/lib/ui/screens/home_menu/about_dialog_content.dart index a94d01cc..61fcb2ac 100644 --- a/lib/ui/screens/home_menu/about_dialog_content.dart +++ b/lib/ui/screens/home_menu/about_dialog_content.dart @@ -49,27 +49,27 @@ class AboutDialogContent extends StatelessWidget { children: [ ...buildSpan($strings.homeMenuAboutWonderous), ...buildSpan($strings.homeMenuAboutBuilt('{flutterUrl}', '{gskinnerUrl}'), linkSupplants: { - 'flutterUrl': [$strings.homeMenuAboutFlutter, 'https://flutter.dev'], - 'gskinnerUrl': [$strings.homeMenuAboutGskinner, 'https://gskinner.com/flutter'], + '{flutterUrl}': [$strings.homeMenuAboutFlutter, 'https://flutter.dev'], + '{gskinnerUrl}': [$strings.homeMenuAboutGskinner, 'https://gskinner.com/flutter'], }), ...buildSpan('\n\n'), - ...buildSpan($strings.homeMenuAboutLearn('wonderousUrl'), linkSupplants: { - 'wonderousUrl': [$strings.homeMenuAboutApp, 'https://wonderous.app'], + ...buildSpan($strings.homeMenuAboutLearn('{wonderousUrl}'), linkSupplants: { + '{wonderousUrl}': [$strings.homeMenuAboutApp, 'https://wonderous.app'], }), ...buildSpan('\n\n'), - ...buildSpan($strings.homeMenuAboutSource('githubUrl'), linkSupplants: { - 'githubUrl': [$strings.homeMenuAboutRepo, 'https://github.com/gskinnerTeam/flutter-wonderous-app'], + ...buildSpan($strings.homeMenuAboutSource('{githubUrl}'), linkSupplants: { + '{githubUrl}': [$strings.homeMenuAboutRepo, 'https://github.com/gskinnerTeam/flutter-wonderous-app'], }), ...buildSpan('\n\n'), - ...buildSpan($strings.homeMenuAboutPublic('metUrl'), linkSupplants: { - 'metUrl': [ + ...buildSpan($strings.homeMenuAboutPublic('{metUrl}'), linkSupplants: { + '{metUrl}': [ $strings.homeMenuAboutMet, 'https://www.metmuseum.org/about-the-met/policies-and-documents/open-access' ], }), ...buildSpan('\n\n'), - ...buildSpan($strings.homeMenuAboutPhotography('unsplashUrl'), linkSupplants: { - 'unsplashUrl': [$strings.homeMenuAboutUnsplash, 'https://unsplash.com/@gskinner/collections'], + ...buildSpan($strings.homeMenuAboutPhotography('{unsplashUrl}'), linkSupplants: { + '{unsplashUrl}': [$strings.homeMenuAboutUnsplash, 'https://unsplash.com/@gskinner/collections'], }), ], ), diff --git a/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart b/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart index 97716917..15c05604 100644 --- a/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart +++ b/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart @@ -29,11 +29,10 @@ class PyramidsGizaIllustration extends StatelessWidget { Positioned.fill( child: IllustrationTexture( ImagePaths.roller2, - color: Color(0xff797FD8), + color: Color(0xFF797FD8), opacity: anim.drive(Tween(begin: 0, end: .75)), flipY: true, scale: config.shortMode ? 4 : 1.15, - ), ), IllustrationPiece( @@ -55,8 +54,8 @@ class PyramidsGizaIllustration extends StatelessWidget { enableHero: true, heightFactor: .5, minHeight: 300, - zoomAmt: config.shortMode ? -.2 : -2, - fractionalOffset: Offset(config.shortMode ? .015 : 0, config.shortMode ? .17 : -.15), + zoomAmt: 0, //config.shortMode ? -.2 : -2, + fractionalOffset: Offset.zero, //Offset(config.shortMode ? .015 : 0, config.shortMode ? .17 : -.15), ) ]; } diff --git a/pubspec.lock b/pubspec.lock index 7348aa21..808dbd67 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1149,10 +1149,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "862015c5db1f3f3c4ea3b94dc2490363a84262994b88902315ed74be1155612f" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.1.1" sync_http: dependency: transitive description: @@ -1173,10 +1173,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: c9aba3b3dbfe8878845dfab5fa096eb8de7b62231baeeb1cea8e3ee81ca8c6d8 url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.4.15" timing: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 103ab083..13c540e0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: wonders description: Explore the famous wonders of the world. publish_to: "none" -version: 2.0.1 +version: 2.0.2 environment: sdk: ">=2.17.0 <3.0.0"