From e26e2fee5a738e1cc5e4124f7079c7de3488bc7f Mon Sep 17 00:00:00 2001 From: Brent Vatne Date: Mon, 5 Nov 2018 14:22:35 -0800 Subject: [PATCH] Improve UIKit style masking and button opacity --- packages/stack/src/views/Header/Header.js | 6 +++--- .../views/Header/HeaderStyleInterpolator.js | 4 ++-- .../stack/src/views/assets/back-icon-mask.png | Bin 659 -> 1619 bytes 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/stack/src/views/Header/Header.js b/packages/stack/src/views/Header/Header.js index 278bb195..82c409ed 100644 --- a/packages/stack/src/views/Header/Header.js +++ b/packages/stack/src/views/Header/Header.js @@ -684,10 +684,10 @@ const styles = StyleSheet.create({ }, iconMask: { // These are mostly the same as the icon in ModularHeaderBackButton - height: 21, - width: 12, + height: 23, + width: 14.5, marginLeft: 8.5, - marginTop: -0.5, // resizes down to 20.5 + marginTop: -2.5, alignSelf: 'center', resizeMode: 'contain', transform: [{ scaleX: I18nManager.isRTL ? -1 : 1 }], diff --git a/packages/stack/src/views/Header/HeaderStyleInterpolator.js b/packages/stack/src/views/Header/HeaderStyleInterpolator.js index ae4ed1ea..d045f56b 100644 --- a/packages/stack/src/views/Header/HeaderStyleInterpolator.js +++ b/packages/stack/src/views/Header/HeaderStyleInterpolator.js @@ -172,9 +172,9 @@ function forLeftButton(props) { const outputRange = [ 0, hasHeader(scenes[first]) ? 0 : 1, - hasHeader(scenes[first]) ? 0.1 : 1, + hasHeader(scenes[first]) ? 0.3 : 1, hasHeader(scenes[index]) ? 1 : 0, - hasHeader(scenes[last]) ? 0.1 : 1, + hasHeader(scenes[last]) ? 0.3 : 1, hasHeader(scenes[last]) ? 0 : 1, 0, ]; diff --git a/packages/stack/src/views/assets/back-icon-mask.png b/packages/stack/src/views/assets/back-icon-mask.png index 5fa299b74967d4ef698f84f6f0208277befacdae..dbddbdff603cb6ede24cdf2e881bdc2288078011 100644 GIT binary patch literal 1619 zcmV-Z2CVssP)Px*4M{{nRCoc^n@eb1RT#&eM`qF(tn~q%)R@vts^Wv#3JOxSDK6ASNf#BgxM^x4 z1zU`0ve3u&!cwE-8lx^d}3TuIQ>CK&)`#AT& z;hg*ae&_$4=e;*}m*ru6e0^AK&Er^>yL=sARJ z@U^n{_Vy-G;aR-sEa^jjK?uZ`($S5j1j%!_)KwrJ)jmIiFN&z2Kn2a_dV+vZ0eKFB z;mPIY<)?tSME(&!RVci-r>-S;0;0L9s_Gj+e0L{bKmE0mM0sztFNDITmqsw zY7he1RD|~vS&f_6K86Y!mPalmm`~h?3fBO55$hufp;Axs4qIcV7syv>M^uCA$T4E1 zAyoKr)Ht9_)I*%Qk&8Nn?3Zi(j4CTphl$tJ)O7PA@)wj@h%!vPzP|pSm6eru=nSPy zWMQ_3DC*f~XJ@0LKhgWk%|f4?m92;Y(_38@x|?yiZpS zBkFbBh}j=>S}}+WZfa^;!o_Z&$lIiYK||rUsFax72~ z8K$urBY;oHevK;Aq@KV8R!0O;81fB(>Ps6jgIe2uyij>`TjXMhRfYB~1~T@hn60EK^s9s;bS zI%5rpfCQs|bs5rp#O9N1yY6SK0?ET{{yh!M1wdT?J#8IG9wyEoqpjr6;9^GsN@>4S zuo6TDV|<(s;Igc0eg=&GsCI0a91l8`fZxYx&DI+m8wdGpT~mOw#DATh`9B+w;KQwi R$Hf2u002ovPDHLkV1j7o`CR}2 literal 659 zcmV;E0&M+>P)6o;9anc+?EEZbfD3wanfO{T9 z4xm!0Ob_A@Jb)ZPyy+RGZkNM3&E2`810JZ|{s6q#zR4UEWGamr}`}`MK0KZ%&fOH7;{v>Yo zLL^;A(~V63Q6ef?maPvJJ-rZ3kJIUeCK>};6~9uZm-;~-Rw>6F^#`_uhZb{L0PVru zr~nJ&;q^4Zk*1jRC;56m%^Jj>N5W~MJEa=*BAs$Zoa~X(ZBoKh?^Dk1NCL!3e<9E< zNq{)*61WiuPKmE6^;kanyZ37cF31ANFMx=bpa7?1LunCET87m-h$FH9@=FmTh*7eO tL1Tz4%XR>tB>{dG;OlIFj(mg90{|ERezlm^CdmK*002ovPDHLkV1n#N8`J;*