From 9571d0db1eb592f8ce73e8617038efecf1b3dceb Mon Sep 17 00:00:00 2001 From: Bret Johnson Date: Mon, 7 Aug 2023 18:04:00 -0400 Subject: [PATCH] Crop off the 3 button nav at the bottom of Android screens. --- .../tests/UITests/Tests/UITestBase.cs | 16 ++++++++++++---- .../snapshots/android/Issue15330Test.png | Bin 13304 -> 11548 bytes 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Controls/tests/UITests/Tests/UITestBase.cs b/src/Controls/tests/UITests/Tests/UITestBase.cs index 463960b5b7a5..592c12ea0c9f 100644 --- a/src/Controls/tests/UITests/Tests/UITestBase.cs +++ b/src/Controls/tests/UITests/Tests/UITestBase.cs @@ -146,19 +146,27 @@ public void VerifyScreenshot(string? name = null) // For Android and iOS, crop off the OS status bar at the top since it's not part of the // app itself and contains the time, which always changes - int topStatusBarHeight = _testDevice switch + int cropFromTop = _testDevice switch { TestDevice.Android => 60, TestDevice.iOS => 90, - _ => -1, + _ => 0, }; - if (topStatusBarHeight != -1) + // For Android also crop the 3 button nav from the bottom, since it's not part of the + // app itself and the button color can vary (the buttons change clear briefly when tapped) + int cropFromBottom = _testDevice switch + { + TestDevice.Android => 125, + _ => 0, + }; + + if (cropFromTop > 0 || cropFromBottom > 0) { IImageEditor imageEditor = _imageEditorFactory.CreateImageEditor(actualImage); (int width, int height) = imageEditor.GetSize(); - imageEditor.Crop(0, topStatusBarHeight, width, height - topStatusBarHeight); + imageEditor.Crop(0, cropFromTop, width, height - cropFromTop - cropFromBottom); actualImage = imageEditor.GetUpdatedImage(); } diff --git a/src/Controls/tests/UITests/snapshots/android/Issue15330Test.png b/src/Controls/tests/UITests/snapshots/android/Issue15330Test.png index 44f2b0d9e8be0a2d5e8865df3093f06efeab7e6c..8aefbfe51fa5ddeef3b7dc5a4d15f0845f7455e9 100644 GIT binary patch literal 11548 zcmeHNe@q)?7=AmP1U~jwvx6YST7^6)9WWIYv{CJHHWQqRIX-`$Nr} z+?)IHe$U&{jNc)UDmDw*w5CATkC=9|TE)tEXZ5 zDg@ndl7VC#t__064)ZY>c?%?hlHg{?&Aa2sp(ORaxhs<#$@V^_FUfi*=*uT3l(n=> zM@7=9)$05oDAjWSxu2Jo6dPaq=|-U8O5V>cRo_42d$-K5lNM%P7lzDV5BE4$ir>^1 zuQTo4@W#l|d2)|CLYhZ^BrW-^1)SN6keZhr-pAU<d-i=h=U8@-uBcD<+&` z*~^)s*!7<5ZcZ3?=1~I8jaUR%V33Y?3J>uKu644UOGQ$7o}f?3(A>l^E}BCLS#B-e znr3qZ*C{T^v|}+vSHP~EF6iQ$Jmt6B`I>@|K6O4kxHhg{ykfbQk^InB%g!zrjP9bl zuyfT*Fu!XFHoImCc4z+*Y~kZ@a=DxVMQU9K?%>hZ*7~Z9;WBQcK5OBRP$}uXhJDY{(;`F^@`>~aoid0U6o}^EMrDx z+6mX5=BC0BwJ@a}+NDSi*%lAXy+>Xv_{G~jQ+DS}TT@PbVW=y0{)5%K70FY!SR$RI zKMEdRf1ISJ+mx~ff==D&GLZB^TRThYwuMxL4032qtay=@hKg3k+ivOQUa6{^8|Yak z3=13hgu9m%Xe{BCd$qzuBr91go(_X8^FK9l{x;3qxelItr868ddVNpuU-oq$uR7AX zBj>S8a_Wr6(3-6qP)o38w~r56BuwmAF3OqKMJ~ z^%9CiRL1wee~2ztvO)oSnRFvWZbeD-lZUuSkj~@~2~u=_|72YyXAf3t_iD$gN zfl3ktHjGd#6HW>Ia*!pE5pm(bMG^%8>L%2PD5bG&z!vF$+DXm_!xiYwqc@Mqe z$qrPEO1+6;H!%f9)n-jT*;Kgca&OH0*PF?|&j6)5L&?CCrjFkMqX86W literal 13304 zcmeHOYfuwe7Ve0c5efL34M>Jy`9O3uA*eK>L>-WE7!10u5giGNyhoE!l!zpa;DjB8 zU@3}E+Ff*=(vh&PSwur38zBRTDIFCA$-@jHAS4k&LSAp1$|%)AjZJAz?!-$!nGu1VNC&az+SN;;h`m&+$lp3Gn{GBPqAJa{lPG*nhr z=IQAgrCMI8jhgz~k{uCKHRra=Bc|$;qcrpT2YFPEAeC zmh1ZQCqUR07aQ$&A@ln{tU%0JA0I>PB~qrtVI39JBnS#EULUSv?dOM!BCN^58$@L1q3vx=AN)*;f`9NP2VCt7yc^xFaK$8ocNetx2}H`h z_ZL|Ll{>?A(md-pEUSKa99FM6Fb>;ggvVij%Y6^)j3lY3LruNzhYHZ#>FZ-_=2z%# z`n~zrM~gg!49!khlNatylqDGH6sDz@M3n6{zT4Duv!cqSD?m$f?LBXND-2AVFEi26 zKw$bCM|(S%--yARYn>|MERC6zd}h2aL2F%40sHMG=C5hkr1Pw0&$j#Ur5eM!D9n7r zT6f?wX6~=wyXD&m-GMxXB({cPT3FvpW+eLXOEuO-L5qpld|g+6!J4DiKp!k#YKLzz z2I>v-6H}L{I2r$nSttb<_c`lEzaY4;!jnWiGyd@34|joIA(&X0t!l2u z(yhDLg?*k><3&6g_+r5K0!{@u6XHyWGa=4|I1}Pbh%+J1gg6u8O!y&~5X>yZA!ar@!M($J9kVD#^hQT3a#e6bz_Goma1WzkjE3|b=VYL}yJM-~;We9$+?np2 z%#T-^*`Sm9wy79=uea^yj14Gk&p7rT@Q&*&mAKx~1Qs%|vpaheN6p1tyyj}fbZ{g@|vArUZT z8^)CEMOtgX6KV>abVUu?!gpX}Pt)3aSk<6H@hnOos5DOyn7X)b-={p;<93Cs2(u6o zi-L=OC)V>1$z5%{Pf4l(*Q4C1#Q=3sJJT;>zRq*T&e`(1d9r4<+}y@$1@}NzE($(T zns4Qsq^vu~M22{w)quL5x)oNYlvUTnlPy3T_s|^7*#)N>*nV+mKHhB)6$GuP2+-@{XupKc#t-bMzWeWx^U= z9B}Tbgn$#tM)#NK`Li{zQyz`CcOJ~WGPcigF~wWeYHH~EX1oI}AajRVR+`+X9V!c@ z(2nZ)u_D7IKQZ|gXO=kEaJ3~8t8G-+hpr`!w--j(H+ZX#o5zg);#{5juf_*FSrBvI zwbe@Va=EFL1vU;Ujd>m&WpoOy1-K833?bYIge)?oj#X(z$*|^_Z(aQqrTK}og=^dD zn!_2phT6CFSo42!$NGyadO2X3(tI>vOy=?aK}g)bO7rN;6{gRy5%sm9<;y7C*J+Jv ze=)f~-ujx3l?J9&hEZtGxu640BgN{boWp*{r?nHc!=IkuHnUeprNT+Kv`&)Jd@#Rn z!}E*l#tB5Q?KHq+f?%&!;xB@x&MMTRPJ#mfPI zG3xFs6JoP&VGFHfg*^_u&IY4e;h@&}gpHVU>($N~`Tg+}w~i=&zX3C0p}k1!E~5Se z+|t`NkMD80bC?NwXaaL%Jq&&ljF`Fk$BeGEjuIw8k_8LF5+>832R(I=vF|jAXiB7i zjE50Gc=Oy$HM~0GB6dn+UQW!`oZUNfQdgwxOT}&wgU$$BOb=hofH#N2E0!%^u`F~E zoxXxjFAct;_z%Dy?(WRAL%$7h=26B^=PdYl4>_58QupWV+{62A%nk0Umly_GAG0C4 JdTnyyKLK>auc`n5