diff --git a/lib/ui/wonder_illustrations/chichen_itza_illustration.dart b/lib/ui/wonder_illustrations/chichen_itza_illustration.dart index b43939cd..d5e64bda 100644 --- a/lib/ui/wonder_illustrations/chichen_itza_illustration.dart +++ b/lib/ui/wonder_illustrations/chichen_itza_illustration.dart @@ -39,7 +39,7 @@ class ChichenItzaIllustration extends StatelessWidget { enableHero: true, heightFactor: .4, minHeight: 200, - fractionalOffset: Offset(.55, config.shortMode ? -.1 : -.35), + fractionalOffset: Offset(.55, config.shortMode ? .2 : -.35), ), ]; } @@ -48,11 +48,11 @@ class ChichenItzaIllustration extends StatelessWidget { // We want to size to the shortest side return [ Transform.translate( - offset: Offset(0, config.shortMode ? 40 : -30), + offset: Offset(0, config.shortMode ? 70 : -30), child: IllustrationPiece( fileName: 'chichen.png', - heightFactor: .45, - minHeight: 300, + heightFactor: .4, + minHeight: 180, zoomAmt: -.1, enableHero: true, ), diff --git a/lib/ui/wonder_illustrations/christ_redeemer_illustration.dart b/lib/ui/wonder_illustrations/christ_redeemer_illustration.dart index a1cec23a..71d3f8f7 100644 --- a/lib/ui/wonder_illustrations/christ_redeemer_illustration.dart +++ b/lib/ui/wonder_illustrations/christ_redeemer_illustration.dart @@ -31,7 +31,7 @@ class ChristRedeemerIllustration extends StatelessWidget { color: Color(0xffFAE5C8), flipX: false, opacity: anim.drive(Tween(begin: 0, end: .8)), - scale: config.shortMode ? 4 : 1.15, + scale: config.shortMode ? 3.5 : 1.15, ), ), IllustrationPiece( diff --git a/lib/ui/wonder_illustrations/colosseum_illustration.dart b/lib/ui/wonder_illustrations/colosseum_illustration.dart index 7d989e45..68ff54ea 100644 --- a/lib/ui/wonder_illustrations/colosseum_illustration.dart +++ b/lib/ui/wonder_illustrations/colosseum_illustration.dart @@ -31,7 +31,7 @@ class ColosseumIllustration extends StatelessWidget { ImagePaths.roller1, color: Colors.white, opacity: anim.drive(Tween(begin: 0, end: .75)), - scale: config.shortMode ? 4 : 1, + scale: config.shortMode ? 3 : 1, ), ), IllustrationPiece( diff --git a/lib/ui/wonder_illustrations/great_wall_illustration.dart b/lib/ui/wonder_illustrations/great_wall_illustration.dart index f6f1996f..fab8367a 100644 --- a/lib/ui/wonder_illustrations/great_wall_illustration.dart +++ b/lib/ui/wonder_illustrations/great_wall_illustration.dart @@ -39,9 +39,9 @@ class GreatWallIllustration extends StatelessWidget { fileName: 'sun.png', initialOffset: Offset(0, 50), enableHero: true, - heightFactor: config.shortMode ? .05 : .25, - minHeight: 150, - offset: config.shortMode ? Offset(-40, context.heightPx * -.06) : Offset(-75, context.heightPx * -.3), + heightFactor: config.shortMode ? .07 : .25, + minHeight: 120, + offset: config.shortMode ? Offset(-40, context.heightPx * -.06) : Offset(-65, context.heightPx * -.3), ), ]; } @@ -50,11 +50,11 @@ class GreatWallIllustration extends StatelessWidget { return [ IllustrationPiece( fileName: 'great-wall.png', - heightFactor: .65, - minHeight: 400, + heightFactor: config.shortMode ? .45 : .65, + minHeight: 250, zoomAmt: .05, enableHero: true, - fractionalOffset: Offset(0, config.shortMode ? 0: -.1), + fractionalOffset: Offset(0, config.shortMode ? .15 : -.15), ), ]; } diff --git a/lib/ui/wonder_illustrations/machu_picchu_illustration.dart b/lib/ui/wonder_illustrations/machu_picchu_illustration.dart index a66b42ee..8b203a06 100644 --- a/lib/ui/wonder_illustrations/machu_picchu_illustration.dart +++ b/lib/ui/wonder_illustrations/machu_picchu_illustration.dart @@ -32,7 +32,7 @@ class MachuPicchuIllustration extends StatelessWidget { flipX: false, color: Color(0xff1E736D), opacity: anim.drive(Tween(begin: 0, end: .5)), - scale: config.shortMode ? 4 : 1, + scale: config.shortMode ? 3 : 1, ), ), IllustrationPiece( @@ -50,10 +50,10 @@ class MachuPicchuIllustration extends StatelessWidget { IllustrationPiece( fileName: 'machu-picchu.png', heightFactor: .65, - minHeight: 500, + minHeight: 230, zoomAmt: config.shortMode ? .1 : -1, enableHero: true, - fractionalOffset: Offset(config.shortMode ? 0 : -.05, config.shortMode ? 0.02 : -.12), + fractionalOffset: Offset(config.shortMode ? 0 : -.05, config.shortMode ? 0.12 : -.12), ), ]; diff --git a/lib/ui/wonder_illustrations/petra_illustration.dart b/lib/ui/wonder_illustrations/petra_illustration.dart index 1edb1249..caa19146 100644 --- a/lib/ui/wonder_illustrations/petra_illustration.dart +++ b/lib/ui/wonder_illustrations/petra_illustration.dart @@ -54,8 +54,9 @@ class PetraIllustration extends StatelessWidget { fileName: 'petra.png', heightFactor: .65, minHeight: 500, - zoomAmt: config.shortMode ? -0.05 : -1, + zoomAmt: config.shortMode ? -0.1 : -1, enableHero: true, + fractionalOffset: Offset(0, config.shortMode ? .025 : 0), ), ), ]; diff --git a/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart b/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart index 0eaec5d7..97716917 100644 --- a/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart +++ b/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart @@ -42,7 +42,7 @@ class PyramidsGizaIllustration extends StatelessWidget { enableHero: true, heightFactor: .15, minHeight: 100, - offset: config.shortMode ? Offset(100, context.heightPx * -.06) : Offset(150, context.heightPx * -.3), + offset: config.shortMode ? Offset(120, context.heightPx * -.05) : Offset(120, context.heightPx * -.35), zoomAmt: .05, ), ]; @@ -56,7 +56,7 @@ class PyramidsGizaIllustration extends StatelessWidget { heightFactor: .5, minHeight: 300, zoomAmt: config.shortMode ? -.2 : -2, - fractionalOffset: Offset(0, config.shortMode ? .1 : -.05), + fractionalOffset: Offset(config.shortMode ? .015 : 0, config.shortMode ? .17 : -.15), ) ]; } diff --git a/lib/ui/wonder_illustrations/taj_mahal_illustration.dart b/lib/ui/wonder_illustrations/taj_mahal_illustration.dart index 486a1040..bc7cf453 100644 --- a/lib/ui/wonder_illustrations/taj_mahal_illustration.dart +++ b/lib/ui/wonder_illustrations/taj_mahal_illustration.dart @@ -35,7 +35,7 @@ class TajMahalIllustration extends StatelessWidget { flipY: true, opacity: anim.drive(Tween(begin: 0, end: .7)), color: bgColor, - scale: config.shortMode ? 4 : 1.15, + scale: config.shortMode ? 3 : 1.15, ), ), // Sun @@ -45,7 +45,7 @@ class TajMahalIllustration extends StatelessWidget { enableHero: true, heightFactor: .3, minHeight: 140, - offset: config.shortMode ? Offset(-100, context.heightPx * -.05) : Offset(-220, context.heightPx * -.34), + offset: config.shortMode ? Offset(-100, context.heightPx * -.02) : Offset(-150, context.heightPx * -.34), ), ]; } @@ -53,7 +53,7 @@ class TajMahalIllustration extends StatelessWidget { List _buildMg(BuildContext context, Animation anim) { return [ LayoutBuilder(builder: (_, constraints) { - const double minHeight = 500, heightFactor = .6, poolScale = 1; + const double minHeight = 230, heightFactor = .6, poolScale = 1; return Stack( children: [ IllustrationPiece( @@ -62,11 +62,11 @@ class TajMahalIllustration extends StatelessWidget { minHeight: minHeight, enableHero: true, zoomAmt: .05, - fractionalOffset: Offset(0, config.shortMode ? 0 : -.15), + fractionalOffset: Offset(0, config.shortMode ? .12 : -.15), top: config.shortMode ? null : (_) => FractionalTranslation( - translation: Offset(0, 0.73), + translation: Offset(0, heightFactor), child: IllustrationPiece( fileName: 'pool.png', heightFactor: heightFactor * poolScale,