bachelor/wonders
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue on aboutUs view

Browse Source
This commit is contained in:
Shawn 2022-12-03 12:36:06 -07:00
parent 8cc98b5459
commit 1f9bd92f80
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ui/screens/collectible_found/collectible_found_screen.dart
View File

@ -156,15 +156,16 @@ class CollectibleFoundScreen extends StatelessWidget {
} }
Widget _buildCollectionButton(BuildContext context) { Widget _buildCollectionButton(BuildContext context) {
Duration t = $styles.times.fast; Duration t = $styles.times.med;
return AppBtn.from( return AppBtn.from(
text: $strings.collectibleFoundButtonViewCollection, text: $strings.collectibleFoundButtonViewCollection,
isSecondary: true, isSecondary: true,
onPressed: () => _handleViewCollectionPressed(context), onPressed: () => _handleViewCollectionPressed(context),
) ).animate().fadeIn(delay: t).move(
.animate() begin: Offset(0, 50),
.show(delay: t * 4) duration: t,
.move(begin: Offset(0, $styles.insets.md), duration: t * 3, curve: Curves.easeOutCubic); curve: Curves.easeOutCubic,
);
} }
void _handleViewCollectionPressed(BuildContext context) { void _handleViewCollectionPressed(BuildContext context) {

20
lib/ui/screens/home_menu/about_dialog_content.dart
View File

@ -49,27 +49,27 @@ class AboutDialogContent extends StatelessWidget {
children: [ children: [
...buildSpan($strings.homeMenuAboutWonderous), ...buildSpan($strings.homeMenuAboutWonderous),
...buildSpan($strings.homeMenuAboutBuilt('{flutterUrl}', '{gskinnerUrl}'), linkSupplants: { ...buildSpan($strings.homeMenuAboutBuilt('{flutterUrl}', '{gskinnerUrl}'), linkSupplants: {
'flutterUrl': [$strings.homeMenuAboutFlutter, 'https://flutter.dev'], '{flutterUrl}': [$strings.homeMenuAboutFlutter, 'https://flutter.dev'],
'gskinnerUrl': [$strings.homeMenuAboutGskinner, 'https://gskinner.com/flutter'], '{gskinnerUrl}': [$strings.homeMenuAboutGskinner, 'https://gskinner.com/flutter'],
}), }),
...buildSpan('\n\n'), ...buildSpan('\n\n'),
...buildSpan($strings.homeMenuAboutLearn('wonderousUrl'), linkSupplants: { ...buildSpan($strings.homeMenuAboutLearn('{wonderousUrl}'), linkSupplants: {
'wonderousUrl': [$strings.homeMenuAboutApp, 'https://wonderous.app'], '{wonderousUrl}': [$strings.homeMenuAboutApp, 'https://wonderous.app'],
}), }),
...buildSpan('\n\n'), ...buildSpan('\n\n'),
...buildSpan($strings.homeMenuAboutSource('githubUrl'), linkSupplants: { ...buildSpan($strings.homeMenuAboutSource('{githubUrl}'), linkSupplants: {
'githubUrl': [$strings.homeMenuAboutRepo, 'https://github.com/gskinnerTeam/flutter-wonderous-app'], '{githubUrl}': [$strings.homeMenuAboutRepo, 'https://github.com/gskinnerTeam/flutter-wonderous-app'],
}), }),
...buildSpan('\n\n'), ...buildSpan('\n\n'),
...buildSpan($strings.homeMenuAboutPublic('metUrl'), linkSupplants: { ...buildSpan($strings.homeMenuAboutPublic('{metUrl}'), linkSupplants: {
'metUrl': [ '{metUrl}': [
$strings.homeMenuAboutMet, $strings.homeMenuAboutMet,
'https://www.metmuseum.org/about-the-met/policies-and-documents/open-access' 'https://www.metmuseum.org/about-the-met/policies-and-documents/open-access'
], ],
}), }),
...buildSpan('\n\n'), ...buildSpan('\n\n'),
...buildSpan($strings.homeMenuAboutPhotography('unsplashUrl'), linkSupplants: { ...buildSpan($strings.homeMenuAboutPhotography('{unsplashUrl}'), linkSupplants: {
'unsplashUrl': [$strings.homeMenuAboutUnsplash, 'https://unsplash.com/@gskinner/collections'], '{unsplashUrl}': [$strings.homeMenuAboutUnsplash, 'https://unsplash.com/@gskinner/collections'],
}), }),
], ],
), ),

7
lib/ui/wonder_illustrations/pyramids_giza_illustration.dart
View File

@ -29,11 +29,10 @@ class PyramidsGizaIllustration extends StatelessWidget {
Positioned.fill( Positioned.fill(
child: IllustrationTexture( child: IllustrationTexture(
ImagePaths.roller2, ImagePaths.roller2,
color: Color(0xff797FD8), color: Color(0xFF797FD8),
opacity: anim.drive(Tween(begin: 0, end: .75)), opacity: anim.drive(Tween(begin: 0, end: .75)),
flipY: true, flipY: true,
scale: config.shortMode ? 4 : 1.15, scale: config.shortMode ? 4 : 1.15,
), ),
), ),
IllustrationPiece( IllustrationPiece(
@ -55,8 +54,8 @@ class PyramidsGizaIllustration extends StatelessWidget {
enableHero: true, enableHero: true,
heightFactor: .5, heightFactor: .5,
minHeight: 300, minHeight: 300,
zoomAmt: config.shortMode ? -.2 : -2, zoomAmt: 0, //config.shortMode ? -.2 : -2,
fractionalOffset: Offset(config.shortMode ? .015 : 0, config.shortMode ? .17 : -.15), fractionalOffset: Offset.zero, //Offset(config.shortMode ? .015 : 0, config.shortMode ? .17 : -.15),
) )
]; ];
} }

8
pubspec.lock
View File

@ -1149,10 +1149,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: string_scanner name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" sha256: "862015c5db1f3f3c4ea3b94dc2490363a84262994b88902315ed74be1155612f"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.2.0" version: "1.1.1"
sync_http: sync_http:
dependency: transitive dependency: transitive
description: description:
@ -1173,10 +1173,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 sha256: c9aba3b3dbfe8878845dfab5fa096eb8de7b62231baeeb1cea8e3ee81ca8c6d8
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.4.16" version: "0.4.15"
timing: timing:
dependency: transitive dependency: transitive
description: description:

2
pubspec.yaml
View File

@ -1,7 +1,7 @@
name: wonders name: wonders
description: Explore the famous wonders of the world. description: Explore the famous wonders of the world.
publish_to: "none" publish_to: "none"
version: 2.0.1 version: 2.0.2
environment: environment:
sdk: ">=2.17.0 <3.0.0" sdk: ">=2.17.0 <3.0.0"