From c799eefcd8265858325a64fdee45387b7d447bf7 Mon Sep 17 00:00:00 2001 From: Jared Bell Date: Wed, 21 Dec 2022 19:52:41 -0700 Subject: [PATCH] =?UTF-8?q?Update=20"General=20UI=20Polish=20=E2=80=93?= =?UTF-8?q?=C2=A0Artifact=20Carousel=20tweaks"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Adjust curved clipper for taller spade/pyramid masks. -Wonder graphics adjustments for moons petra/pyramids Update scale for >1000 Tested on macOS, ipad pro (port/land), iphone 14 Pro, samsung active tab pro. --- lib/styles/styles.dart | 2 +- lib/ui/common/curved_clippers.dart | 2 +- lib/ui/wonder_illustrations/petra_illustration.dart | 2 +- lib/ui/wonder_illustrations/pyramids_giza_illustration.dart | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/styles/styles.dart b/lib/styles/styles.dart index 9231cce9..de3fef48 100644 --- a/lib/styles/styles.dart +++ b/lib/styles/styles.dart @@ -21,7 +21,7 @@ class AppStyle { } else if (screenSize > 1400) { scale = 1.15; } else if (screenSize > 1000) { - scale = 1.25; + scale = 1.1; } else if (screenSize > 800) { scale = 1; } else { diff --git a/lib/ui/common/curved_clippers.dart b/lib/ui/common/curved_clippers.dart index d65e78fb..d0bf9747 100644 --- a/lib/ui/common/curved_clippers.dart +++ b/lib/ui/common/curved_clippers.dart @@ -39,7 +39,7 @@ class ArchPoint { } List _getArchPts(Size size, ArchType type) { - double distanceFromTop = size.width / 2.5; + double distanceFromTop = size.width / 3; switch (type) { case ArchType.pyramid: return [ diff --git a/lib/ui/wonder_illustrations/petra_illustration.dart b/lib/ui/wonder_illustrations/petra_illustration.dart index 69f47590..caa19146 100644 --- a/lib/ui/wonder_illustrations/petra_illustration.dart +++ b/lib/ui/wonder_illustrations/petra_illustration.dart @@ -37,7 +37,7 @@ class PetraIllustration extends StatelessWidget { ), IllustrationPiece( fileName: 'moon.png', - initialOffset: Offset(0, 50), + initialOffset: Offset(0, -150), heightFactor: .15, minHeight: 50, alignment: Alignment.topCenter, diff --git a/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart b/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart index 97d080a3..15c05604 100644 --- a/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart +++ b/lib/ui/wonder_illustrations/pyramids_giza_illustration.dart @@ -41,7 +41,7 @@ class PyramidsGizaIllustration extends StatelessWidget { enableHero: true, heightFactor: .15, minHeight: 100, - offset: config.shortMode ? Offset(180, context.heightPx * -.09) : Offset(250, context.heightPx * -.3), + offset: config.shortMode ? Offset(120, context.heightPx * -.05) : Offset(120, context.heightPx * -.35), zoomAmt: .05, ), ];